finished pruning autopep8 changes to my mercurial satisfaction

Author: etjones-erisyon

solid/examples/animation_example.py

@@ -1,30 +1,33 @@
 #! /usr/bin/env python
 # -*- coding: UTF-8 -*-
 from __future__ import division
-import os, sys, re
+import os
+import sys
+import re
 
 from solid import *
 from solid.utils import *
 
+
 def my_animate(_time=0):
     # _time will range from 0 to 1, not including 1
     rads = _time * 2 * 3.1416
     rad = 15
-    c = translate( [rad*cos(rads), rad*sin(rads)])(square(10))
-    
+    c = translate([rad * cos(rads), rad * sin(rads)])(square(10))
+
     return c
 
 if __name__ == '__main__':
     out_dir = sys.argv[1] if len(sys.argv) > 1 else os.curdir
     file_out = os.path.join(out_dir, 'animation_example.scad')
-    
-    print("%(__file__)s: SCAD file written to: \n%(file_out)s"%vars())
-    
-    # To animate in OpenSCAD: 
+
+    print("%(__file__)s: SCAD file written to: \n%(file_out)s" % vars())
+
+    # To animate in OpenSCAD:
     # - Run this program to generate a SCAD file.
     # - Open the generated SCAD file in OpenSCAD
-    # - Choose "View -> Animate" 
-    # - Enter FPS (frames per second) and Steps in the fields 
+    # - Choose "View -> Animate"
+    # - Enter FPS (frames per second) and Steps in the fields
     #       at the bottom of the OpenSCAD window
     # - FPS & Steps are flexible.  For a start, set both to 20 
     #       play around from there      

solid/examples/append_solidpython_code.py

@@ -1,28 +1,29 @@
 #! /usr/bin/env python
 # -*- coding: UTF-8 -*-
-import os, sys
+import os
+import sys
 
 from solid import *
 from solid.utils import *
 
 SEGMENTS = 48
 
+
 def show_appended_python_code():
     a = cylinder(r=10, h=10, center=True) + up(5)(cylinder(r1=10, r2=0, h=10))
-    
+
     return a
 
-if __name__ == '__main__':    
+if __name__ == '__main__':
     out_dir = sys.argv[1] if len(sys.argv) > 1 else os.curdir
     file_out = os.path.join(out_dir, 'append_solidpython_code.scad')
-    
+
     a = show_appended_python_code()
-    
-    print("%(__file__)s: SCAD file written to: \n%(file_out)s"%vars())
+
+    print("%(__file__)s: SCAD file written to: \n%(file_out)s" % vars())
     # ================================================================
     # = include_orig_code appends all python code as comments to the
     # = bottom of the generated OpenSCAD code, so the final document
     # = contains the easy-to-read python code as well as the SCAD.
-    # = ------------------------------------------------------------ = 
-    scad_render_to_file(a, file_out,  include_orig_code=True)        
-
+    # = ------------------------------------------------------------ =
+    scad_render_to_file(a, file_out,  include_orig_code=True)

solid/examples/basic_geometry.py

@@ -1,19 +1,22 @@
 #! /usr/bin/env python
 # -*- coding: UTF-8 -*-
 from __future__ import division
-import os, sys, re
+import os
+import sys
+import re
 
 from solid import *
 from solid.utils import *
 
 SEGMENTS = 48
 
+
 def basic_geometry():
-    # SolidPython code can look a lot like OpenSCAD code.  It also has 
+    # SolidPython code can look a lot like OpenSCAD code.  It also has
     # some syntactic sugar built in that can make it look more pythonic.
     # Here are two identical pieces of geometry, one left and one right.
-    
-    # left_piece uses standard OpenSCAD grammar (note the commas between 
+
+    # left_piece uses standard OpenSCAD grammar (note the commas between
     # block elements; OpenSCAD doesn't require this)
     left_piece =  union()(
                         translate([-15, 0, 0])(
@@ -32,21 +35,21 @@ def basic_geometry():
     # solid.utils also defines up(), down(), left(), right(), forward(), and back()
     # for common transforms.
     right_piece = right(15)(cube([10, 5, 3], center=True))
-    cyl =  cylinder(r=5, h=15, center=True)  - cylinder(r=4, h=16, center=True) 
+    cyl = cylinder(r=5, h=15, center=True) - cylinder(r=4, h=16, center=True)
     right_piece += right(10)(cyl)
-                        
+
     return union()(left_piece, right_piece)
 
-if __name__ == '__main__':    
+if __name__ == '__main__':
     out_dir = sys.argv[1] if len(sys.argv) > 1 else os.curdir
     file_out = os.path.join(out_dir, 'basic_geometry.scad')
-    
+
     a = basic_geometry()
-    
-    print("%(__file__)s: SCAD file written to: \n%(file_out)s"%vars())
-    
+
+    print("%(__file__)s: SCAD file written to: \n%(file_out)s" % vars())
+
     # Adding the file_header argument as shown allows you to change
-    # the detail of arcs by changing the SEGMENTS variable.  This can 
+    # the detail of arcs by changing the SEGMENTS variable.  This can
     # be expensive when making lots of small curves, but is otherwise
     # useful.
-    scad_render_to_file(a, file_out, file_header='$fn = %s;'%SEGMENTS) 
+    scad_render_to_file(a, file_out, file_header='$fn = %s;' % SEGMENTS)

solid/examples/basic_scad_include.py

@@ -1,25 +1,29 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
-import sys, os
+import sys
+import os
 
 from solid import *
 
 # Import OpenSCAD code and call it from Python code.
-# The path given to use() (or include()) must be absolute or findable in sys.path
+# The path given to use() (or include()) must be absolute or findable in
+# sys.path
+
+
 def demo_scad_include():
     # scad_to_include.scad includes a module called steps()
     scad_path = os.path.join(os.path.dirname(__file__), "scad_to_include.scad")
-    use(scad_path) #  could also use 'include', but that has side-effects; 
-                    # 'use' just imports without executing any of the imported code
+    use(scad_path)  # could also use 'include', but that has side-effects;
+    # 'use' just imports without executing any of the imported code
     return steps(5)
 
 
-if __name__ == '__main__':    
+if __name__ == '__main__':
     out_dir = sys.argv[1] if len(sys.argv) > 1 else os.curdir
     file_out = os.path.join(out_dir, 'scad_include_example.scad')
-    
+
     a = demo_scad_include()
-    
-    print("%(__file__)s: SCAD file written to: \n%(file_out)s"%vars())
-    
-    scad_render_to_file(a, file_out)  
+
+    print("%(__file__)s: SCAD file written to: \n%(file_out)s" % vars())
+
+    scad_render_to_file(a, file_out)

solid/examples/bom_scad.py

@@ -1,24 +1,25 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Basic shape with several repeated parts, demonstrating the use of 
-# solid.utils.bill_of_materials() 
+# Basic shape with several repeated parts, demonstrating the use of
+# solid.utils.bill_of_materials()
 #
-# Basically:  
+# Basically:
 #   -- Define every part you want in the Bill of Materials in a function
 #   -- Use the 'bom_part' decorator ahead of the definition of each part's function
-#           e.g.:  
-                # @bom_part()
-                # def my_part():
-                #     pass
-#   -- Optionally, you can add a description and a per-unit cost to the 
-#       decorator invocations.  
+#           e.g.:
+# @bom_part()
+# def my_part():
+#     pass
+#   -- Optionally, you can add a description and a per-unit cost to the
+#       decorator invocations.
 #
 #   -- To generate the bill of materials, call solid.utils.bill_of_materials()
 #
 #       -ETJ 08 Mar 2011
 
-import os, sys
+import os
+import sys
 
 from solid import *
 from solid.utils import *
@@ -33,82 +34,83 @@
 
 doohickey_h = 5
 
+
 def head():
-    return cylinder(h=head_height, r =head_rad)
+    return cylinder(h=head_height, r=head_rad)
 
 
 @bom_part("M3x16 Bolt", 0.12, currency="€")
 def m3_16(a=3):
     bolt_height = 16
     m = union()(
-            head(),
-            translate( [0,0, -bolt_height])(
-                cylinder(r=m3_rad, h=bolt_height)
-            )
+        head(),
+        translate([0, 0, -bolt_height])(
+            cylinder(r=m3_rad, h=bolt_height)
         )
+    )
     return m
 
 
 @bom_part("M3x12 Bolt", 0.09)
 def m3_12():
     bolt_height = 12
     m = union()(
-            head(),
-            translate( [ 0, 0, -bolt_height])(
-                cylinder(r=m3_rad, h=bolt_height)
-            )
+        head(),
+        translate([0, 0, -bolt_height])(
+            cylinder(r=m3_rad, h=bolt_height)
         )
+    )
     return m
 
 
 @bom_part("M3 Nut", 0.04, currency="R$")
 def m3_nut():
     hx = cylinder(r=nut_rad, h=nut_height)
-    hx.add_param('$fn', 6) # make the nut hexagonal
+    hx.add_param('$fn', 6)  # make the nut hexagonal
     n = difference()(
-            hx,
-            translate([0,0,-EPSILON])(
-                cylinder(r=m3_rad, h=nut_height+2*EPSILON )
-            )
+        hx,
+        translate([0, 0, -EPSILON])(
+            cylinder(r=m3_rad, h=nut_height + 2 * EPSILON)
         )
+    )
     return n
 
 
 @bom_part()
 def doohickey():
-    hole_cyl = translate([0,0,-EPSILON])(
-                    cylinder(r=m3_rad, h=doohickey_h+2*EPSILON )
-                )
+    hole_cyl = translate([0, 0, -EPSILON])(
+        cylinder(r=m3_rad, h=doohickey_h + 2 * EPSILON)
+    )
     d = difference()(
-            cube([30, 10, doohickey_h], center=True),
-            translate([-10, 0,0])(hole_cyl),
-            hole_cyl,
-            translate([10,0,0])(hole_cyl)
-        )
+        cube([30, 10, doohickey_h], center=True),
+        translate([-10, 0, 0])(hole_cyl),
+        hole_cyl,
+        translate([10, 0, 0])(hole_cyl)
+    )
     return d
 
 
 def assemble():
     return union()(
-                doohickey(),
-                translate( [-10, 0, doohickey_h/2])(  m3_12()),
-                translate( [ 0, 0, doohickey_h/2])(   m3_16()),
-                translate( [10, 0, doohickey_h/2])(   m3_12()),
-                # Nuts
-                translate( [-10, 0, -nut_height-doohickey_h/2])(  m3_nut()),
-                translate( [ 0, 0, -nut_height-doohickey_h/2])(   m3_nut()),
-                translate( [10, 0, -nut_height-doohickey_h/2])(   m3_nut()),                
-            )
-
-if __name__ == '__main__':    
+        doohickey(),
+        translate([-10, 0, doohickey_h / 2])(m3_12()),
+        translate([  0, 0, doohickey_h / 2])(m3_16()),
+        translate([ 10, 0, doohickey_h / 2])(m3_12()),
+        # Nuts
+        translate([-10, 0, -nut_height - doohickey_h / 2])(m3_nut()),
+        translate([  0, 0, -nut_height - doohickey_h / 2])(m3_nut()),
+        translate([ 10, 0, -nut_height - doohickey_h / 2])(m3_nut()),
+    )
+
+if __name__ == '__main__':
     out_dir = sys.argv[1] if len(sys.argv) > 1 else os.curdir
     file_out = os.path.join(out_dir, 'BOM_example.scad')
-    
+
     a = assemble()
-    
+
     bom = bill_of_materials()
-    
-    print("%(__file__)s: SCAD file written to: \n%(file_out)s"%vars())
+
+    print("%(__file__)s: SCAD file written to: \n%(file_out)s" % vars())
     print(bom)
-    
+
     scad_render_to_file(a, file_out)