From 5b9c8e4d71d08cea03e212b7ccdc9056ad6b1511 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Sun, 19 Mar 2017 07:38:30 +0100 Subject: [PATCH] Remove main function from generators Generators are no longer executable on their own. Use scripts/boxes instead. --- boxes/generators/_template.py | 7 ------- boxes/generators/angledbox.py | 8 -------- boxes/generators/arcade.py | 7 ------- boxes/generators/bintray.py | 8 -------- boxes/generators/castle.py | 8 -------- boxes/generators/closedbox.py | 8 -------- boxes/generators/displayshelf.py | 7 ------- boxes/generators/drillbox.py | 8 -------- boxes/generators/flexbox.py | 8 -------- boxes/generators/flexbox2.py | 8 -------- boxes/generators/flexbox3.py | 8 -------- boxes/generators/flexbox4.py | 8 -------- boxes/generators/flextest.py | 8 -------- boxes/generators/flextest2.py | 8 -------- boxes/generators/folder.py | 8 -------- boxes/generators/gearbox.py | 8 -------- boxes/generators/hingebox.py | 8 -------- boxes/generators/integratedhingebox.py | 8 -------- boxes/generators/jigsaw.py | 8 -------- boxes/generators/lamp.py | 8 -------- boxes/generators/magazinefile.py | 8 -------- boxes/generators/openbox.py | 7 ------- boxes/generators/ottobody.py | 8 -------- boxes/generators/ottolegs.py | 7 ------- boxes/generators/planetary.py | 8 -------- boxes/generators/polehook.py | 7 ------- boxes/generators/printer.py | 8 -------- boxes/generators/pulley.py | 8 -------- boxes/generators/regularbox.py | 8 -------- boxes/generators/robotarm.py | 7 ------- boxes/generators/rotary.py | 8 -------- boxes/generators/roundedbox.py | 8 -------- boxes/generators/silverwarebox.py | 8 -------- boxes/generators/trafficlight.py | 7 ------- boxes/generators/trayinsert.py | 8 -------- boxes/generators/traylayout.py | 19 ------------------- boxes/generators/typetray.py | 8 -------- boxes/generators/ubox.py | 7 ------- boxes/generators/universalbox.py | 7 ------- 39 files changed, 313 deletions(-) mode change 100755 => 100644 boxes/generators/castle.py mode change 100755 => 100644 boxes/generators/closedbox.py mode change 100755 => 100644 boxes/generators/drillbox.py mode change 100755 => 100644 boxes/generators/flexbox.py mode change 100755 => 100644 boxes/generators/flexbox2.py mode change 100755 => 100644 boxes/generators/flexbox3.py mode change 100755 => 100644 boxes/generators/flextest.py mode change 100755 => 100644 boxes/generators/folder.py mode change 100755 => 100644 boxes/generators/lamp.py mode change 100755 => 100644 boxes/generators/magazinefile.py mode change 100755 => 100644 boxes/generators/openbox.py mode change 100755 => 100644 boxes/generators/printer.py mode change 100755 => 100644 boxes/generators/silverwarebox.py mode change 100755 => 100644 boxes/generators/trayinsert.py mode change 100755 => 100644 boxes/generators/traylayout.py mode change 100755 => 100644 boxes/generators/typetray.py mode change 100755 => 100644 boxes/generators/universalbox.py diff --git a/boxes/generators/_template.py b/boxes/generators/_template.py index 6c05341..ffc2e4c 100644 --- a/boxes/generators/_template.py +++ b/boxes/generators/_template.py @@ -64,10 +64,3 @@ class BOX(Boxes): # change class name here and below self.close() -def main(): - b = BOX() # change to class name - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/angledbox.py b/boxes/generators/angledbox.py index 2a3ad9f..1d7f3df 100644 --- a/boxes/generators/angledbox.py +++ b/boxes/generators/angledbox.py @@ -141,11 +141,3 @@ class AngledBox(Boxes): self.close() -def main(): - b = AngledBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/arcade.py b/boxes/generators/arcade.py index 62c4266..73b68b6 100644 --- a/boxes/generators/arcade.py +++ b/boxes/generators/arcade.py @@ -99,10 +99,3 @@ class Arcade(Boxes): self.close() -def main(): - b = Arcade() # change to class name - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/bintray.py b/boxes/generators/bintray.py index d5ac40c..4efd810 100644 --- a/boxes/generators/bintray.py +++ b/boxes/generators/bintray.py @@ -142,11 +142,3 @@ class BinTray(Boxes): self.close() -def main(): - b = BinTray() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/castle.py b/boxes/generators/castle.py old mode 100755 new mode 100644 index 7c50544..529e54d --- a/boxes/generators/castle.py +++ b/boxes/generators/castle.py @@ -46,11 +46,3 @@ class Castle(Boxes): self.close() -def main(): - c = Castle() - c.parseArgs() - c.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/closedbox.py b/boxes/generators/closedbox.py old mode 100755 new mode 100644 index 6f67935..b111015 --- a/boxes/generators/closedbox.py +++ b/boxes/generators/closedbox.py @@ -55,11 +55,3 @@ class ClosedBox(Boxes): self.close() -def main(): - b = ClosedBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/displayshelf.py b/boxes/generators/displayshelf.py index 8ec571d..d7714d9 100644 --- a/boxes/generators/displayshelf.py +++ b/boxes/generators/displayshelf.py @@ -78,10 +78,3 @@ class DisplayShelf(Boxes): # change class name here and below self.close() -def main(): - b = DisplayShelf() # change to class name - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/drillbox.py b/boxes/generators/drillbox.py old mode 100755 new mode 100644 index b7bca1a..26d2f86 --- a/boxes/generators/drillbox.py +++ b/boxes/generators/drillbox.py @@ -69,11 +69,3 @@ in 0.5mm steps, 3 holes each size""" self.close() -def main(): - b = DrillBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/flexbox.py b/boxes/generators/flexbox.py old mode 100755 new mode 100644 index 64665c9..638dd04 --- a/boxes/generators/flexbox.py +++ b/boxes/generators/flexbox.py @@ -111,11 +111,3 @@ class FlexBox(boxes.Boxes): self.close() -def main(): - b = FlexBox() - b.parseArgs() - b.render() - - -if __name__ == "__main__": - main() diff --git a/boxes/generators/flexbox2.py b/boxes/generators/flexbox2.py old mode 100755 new mode 100644 index 4328420..0eae553 --- a/boxes/generators/flexbox2.py +++ b/boxes/generators/flexbox2.py @@ -112,11 +112,3 @@ class FlexBox2(Boxes): self.close() -def main(): - b = FlexBox2() - b.parseArgs() - b.render() - - -if __name__ == "__main__": - main() diff --git a/boxes/generators/flexbox3.py b/boxes/generators/flexbox3.py old mode 100755 new mode 100644 index 159f3aa..b4b28ba --- a/boxes/generators/flexbox3.py +++ b/boxes/generators/flexbox3.py @@ -161,11 +161,3 @@ class FlexBox3(Boxes): self.close() -def main(): - b = FlexBox3() # 100, 40, 100, r=20, h=10, thickness=4.0) - b.parseArgs() - b.render() - - -if __name__ == "__main__": - main() diff --git a/boxes/generators/flexbox4.py b/boxes/generators/flexbox4.py index a95d6f6..f9f5136 100644 --- a/boxes/generators/flexbox4.py +++ b/boxes/generators/flexbox4.py @@ -106,11 +106,3 @@ class FlexBox4(Boxes): self.close() -def main(): - b = FlexBox4() - b.parseArgs() - b.render() - - -if __name__ == "__main__": - main() diff --git a/boxes/generators/flextest.py b/boxes/generators/flextest.py old mode 100755 new mode 100644 index 4640011..f58894c --- a/boxes/generators/flextest.py +++ b/boxes/generators/flextest.py @@ -46,11 +46,3 @@ class FlexTest(Boxes): self.close() -def main(): - f = FlexTest() - f.parseArgs() - f.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/flextest2.py b/boxes/generators/flextest2.py index 1de5e36..aa0b197 100644 --- a/boxes/generators/flextest2.py +++ b/boxes/generators/flextest2.py @@ -37,11 +37,3 @@ class FlexTest2(Boxes): self.close() -def main(): - f = FlexTest() - f.parseArgs() - f.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/folder.py b/boxes/generators/folder.py old mode 100755 new mode 100644 index 85bbf61..e57faf0 --- a/boxes/generators/folder.py +++ b/boxes/generators/folder.py @@ -49,11 +49,3 @@ class Folder(Boxes): self.close() -def main(): - f = Folder() - f.parseArgs() - f.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/gearbox.py b/boxes/generators/gearbox.py index 022979d..dfeb59d 100644 --- a/boxes/generators/gearbox.py +++ b/boxes/generators/gearbox.py @@ -99,11 +99,3 @@ class GearBox(Boxes): self.close() -def main(): - b = GearBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/hingebox.py b/boxes/generators/hingebox.py index a72bb2c..5264924 100644 --- a/boxes/generators/hingebox.py +++ b/boxes/generators/hingebox.py @@ -61,11 +61,3 @@ class HingeBox(Boxes): self.close() -def main(): - b = HingeBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/integratedhingebox.py b/boxes/generators/integratedhingebox.py index eaa4256..8082ccd 100644 --- a/boxes/generators/integratedhingebox.py +++ b/boxes/generators/integratedhingebox.py @@ -65,11 +65,3 @@ class IntegratedHingeBox(Boxes): self.close() -def main(): - b = IntegratedHingeBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/jigsaw.py b/boxes/generators/jigsaw.py index 3e80e54..0581943 100644 --- a/boxes/generators/jigsaw.py +++ b/boxes/generators/jigsaw.py @@ -89,11 +89,3 @@ class JigsawPuzzle(Boxes): # change class name here and below self.close() -def main(): - b = JigsawPuzzle() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/lamp.py b/boxes/generators/lamp.py old mode 100755 new mode 100644 index ef2c753..9c141bd --- a/boxes/generators/lamp.py +++ b/boxes/generators/lamp.py @@ -124,11 +124,3 @@ class Lamp(Boxes): self.close() -def main(): - l = Lamp() - l.parseArgs() - l.render(r=4 * 25.4, w=20, x=270, y=150, h=100) - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/magazinefile.py b/boxes/generators/magazinefile.py old mode 100755 new mode 100644 index a88eb3c..c394df5 --- a/boxes/generators/magazinefile.py +++ b/boxes/generators/magazinefile.py @@ -86,11 +86,3 @@ class MagazinFile(Boxes): self.close() -def main(): - b = MagazinFile() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/openbox.py b/boxes/generators/openbox.py old mode 100755 new mode 100644 index c278975..a3dedf0 --- a/boxes/generators/openbox.py +++ b/boxes/generators/openbox.py @@ -52,10 +52,3 @@ class OpenBox(Boxes): self.close() -def main(): - b = OpenBox() - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/ottobody.py b/boxes/generators/ottobody.py index 7a6cb3a..4c9c5e7 100644 --- a/boxes/generators/ottobody.py +++ b/boxes/generators/ottobody.py @@ -98,11 +98,3 @@ class OttoBody(Boxes): self.close() -def main(): - b = OttoBody() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/ottolegs.py b/boxes/generators/ottolegs.py index edfa835..46d7e32 100644 --- a/boxes/generators/ottolegs.py +++ b/boxes/generators/ottolegs.py @@ -134,10 +134,3 @@ class OttoLegs(Boxes): self.foot(60, 40, ly, 30, move="right") self.close() -def main(): - b = OttoLegs() - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/planetary.py b/boxes/generators/planetary.py index 4cd7e34..83528db 100644 --- a/boxes/generators/planetary.py +++ b/boxes/generators/planetary.py @@ -108,11 +108,3 @@ class Planetary(Boxes): self.close() -def main(): - b = Planetary() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/polehook.py b/boxes/generators/polehook.py index 7bc0d55..2efb972 100644 --- a/boxes/generators/polehook.py +++ b/boxes/generators/polehook.py @@ -130,10 +130,3 @@ class PoleHook(Boxes): # change class name here and below self.close() -def main(): - b = PoleHook() # change to class name - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/printer.py b/boxes/generators/printer.py old mode 100755 new mode 100644 index 670d23f..e932ecf --- a/boxes/generators/printer.py +++ b/boxes/generators/printer.py @@ -190,11 +190,3 @@ class Printer(Boxes): self.close() -def main(): - p = Printer() - p.parseArgs() - p.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/pulley.py b/boxes/generators/pulley.py index 0f119b8..00ce02f 100644 --- a/boxes/generators/pulley.py +++ b/boxes/generators/pulley.py @@ -85,11 +85,3 @@ class Pulley(Boxes): self.close() -def main(): - b = Pulley() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/regularbox.py b/boxes/generators/regularbox.py index 08f3675..e46757b 100644 --- a/boxes/generators/regularbox.py +++ b/boxes/generators/regularbox.py @@ -95,11 +95,3 @@ class RegularBox(Boxes): self.close() -def main(): - b = RegularBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/robotarm.py b/boxes/generators/robotarm.py index 2c633c6..4bbbdb7 100644 --- a/boxes/generators/robotarm.py +++ b/boxes/generators/robotarm.py @@ -60,10 +60,3 @@ class RobotArm(Boxes): # change class name here and below armcls(self, servoClsA(self), servoClsB(self))(length, move="up") self.close() -def main(): - b = RobotArm() - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/rotary.py b/boxes/generators/rotary.py index 3cd0d53..67f3989 100644 --- a/boxes/generators/rotary.py +++ b/boxes/generators/rotary.py @@ -334,11 +334,3 @@ class Rotary(Boxes): self.close() -def main(): - b = Box() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/roundedbox.py b/boxes/generators/roundedbox.py index 72fee2d..4134767 100644 --- a/boxes/generators/roundedbox.py +++ b/boxes/generators/roundedbox.py @@ -82,11 +82,3 @@ class RoundedBox(Boxes): self.close() -def main(): - b = RoundedBox() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/silverwarebox.py b/boxes/generators/silverwarebox.py old mode 100755 new mode 100644 index 8b3e600..8f747bb --- a/boxes/generators/silverwarebox.py +++ b/boxes/generators/silverwarebox.py @@ -91,11 +91,3 @@ using flex for rounded corners""" self.close() -def main(): - b = Silverware() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/trafficlight.py b/boxes/generators/trafficlight.py index 6cfb012..6919eb6 100644 --- a/boxes/generators/trafficlight.py +++ b/boxes/generators/trafficlight.py @@ -168,10 +168,3 @@ class TrafficLight(Boxes): # change class name here and below self.close() -def main(): - b = TrafficLight() # change to class name - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/trayinsert.py b/boxes/generators/trayinsert.py old mode 100755 new mode 100644 index 89e0a06..60a9483 --- a/boxes/generators/trayinsert.py +++ b/boxes/generators/trayinsert.py @@ -51,11 +51,3 @@ class TrayInsert(Boxes): self.close() -def main(): - b = TrayInsert() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/traylayout.py b/boxes/generators/traylayout.py old mode 100755 new mode 100644 index 966c5d4..f6a1e10 --- a/boxes/generators/traylayout.py +++ b/boxes/generators/traylayout.py @@ -413,22 +413,3 @@ class TrayLayout2(Layout): "--layout", action="store", type=str) -def main(): - l = Layout() - l.parseArgs() - if l.x and l.y: - l.fillDefault(l.x, l.y) - if l.output: - with open(l.output, "w") as f: - f.write(str(l)) - else: - print(l) - elif l.input: - l.parse(l.input) - l.render() - else: - l.argparser.print_usage() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/typetray.py b/boxes/generators/typetray.py old mode 100755 new mode 100644 index f99702d..98c26f4 --- a/boxes/generators/typetray.py +++ b/boxes/generators/typetray.py @@ -108,11 +108,3 @@ class TypeTray(Boxes): self.close() -def main(): - b = TypeTray() - b.parseArgs() - b.render() - - -if __name__ == '__main__': - main() diff --git a/boxes/generators/ubox.py b/boxes/generators/ubox.py index d5f56d0..19a8f94 100644 --- a/boxes/generators/ubox.py +++ b/boxes/generators/ubox.py @@ -107,10 +107,3 @@ class UBox(_TopEdge, _ChestLid): self.close() -def main(): - b = UBox() - b.parseArgs() - b.render() - -if __name__ == '__main__': - main() diff --git a/boxes/generators/universalbox.py b/boxes/generators/universalbox.py old mode 100755 new mode 100644 index f972259..9e305a9 --- a/boxes/generators/universalbox.py +++ b/boxes/generators/universalbox.py @@ -66,10 +66,3 @@ class UniversalBox(_TopEdge, _ChestLid): self.close() -def main(): - b = UniversalBox() - b.parseArgs() - b.render() - -if __name__ == '__main__': - main()