Move finalization into global function

box.py

@@ -39,9 +39,7 @@ class Box(Boxes):
         self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3], move="right")
         self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3])
 
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 b = Box(140, 202, 50, thickness=4.0)
 b.edges["f"].settings.setValues(b.thickness, space=3, finger=3,

box2.py

@@ -39,9 +39,7 @@ class Box(Boxes):
         
         self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3])
 
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 b = Box(200, 200, 200, thickness=4.0)
 b.edges["f"].settings.setValues(b.thickness, space=3, finger=3,

box3.py

@@ -39,9 +39,7 @@ class Box(Boxes):
         self.rectangularWall(x, y, "efff", bedBolts=[d2, d3, d2, d3], move="left")
         #self.rectangularWall(x, y, "ffff", bedBolts=[d2, d3, d2, d3])
 
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 t = 6.0
 b = Box(380-2*t, 370-2*t, 120-t, thickness=t)

boxes.py

@@ -516,6 +516,10 @@ class Boxes:
         else:
             return param
 
+    def close(self):
+        self.ctx.stroke()
+        self.surface.flush()
+        self.surface.finish()
 
     ############################################################
     ### Turtle graphics commands
@@ -1034,9 +1038,7 @@ class Boxes:
             self.moveTo(-x-y-40, h+20)
 
 
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 if __name__ == '__main__':
     b = Boxes(900, 700)

castle.py

@@ -42,9 +42,7 @@ class Castle(Boxes):
         self.rectangularWall(w1_x, w1_h, "efpe", move="right")
         self.rectangularWall(w2_x, w2_h, "efpe", move="right")
 
-        self.ctx.stroke()
-        self.surface.finish()
-
+        self.close()
 
 c = Castle()
 c.render()

drillbox.py

@@ -66,9 +66,7 @@ class Box(Boxes):
                                                      self.description],
                              move="up")
 
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 b = Box(120, 240, 60, thickness=4.0)
 b.edges["f"].settings.setValues(b.thickness, space=3, finger=3,

flexbox.py

@@ -82,9 +82,8 @@ class FlexBox(boxes.Boxes):
         self.moveTo(2*self.x+3*self.thickness, 0)
         self.ctx.scale(-1, 1)
         self.flexBoxSide(self.x, self.y, self.r)
-        self.ctx.stroke()
-        self.surface.finish()
 
+        self.close()
 
 if __name__=="__main__":
     b = FlexBox(50, 70, 50, r=15)

flexbox2.py

@@ -87,8 +87,7 @@ class FlexBox(Boxes):
         self.ctx.scale(-1, 1)
         self.moveTo(2*self.thickness, 0)
         self.rectangularWall(self.z, self.y-self.r-self.latchsize, edges="fFeF")
-        self.ctx.stroke()
-        self.surface.finish()
+        self.close()
 
 
 if __name__=="__main__":

flexbox3.py

@@ -130,9 +130,8 @@ class FlexBox(Boxes):
         self.ctx.scale(-1, 1)
         self.moveTo(2*self.thickness, -self.thickness)
         self.rectangularWall(z, y, edges="fFeF")
-        self.ctx.stroke()
-        self.surface.finish()
 
+        self.close()
 
 if __name__=="__main__":
     b = FlexBox(100, 40, 100, r=20, h=10, thickness=4.0)

flextest.py

@@ -32,8 +32,7 @@ class FlexTest(Boxes):
         self.edge(y)
         self.corner(90)
 
-        self.ctx.stroke()
-        self.surface.flush()
+        self.close()
 
 x = 40
 y = 100

folder.py

@@ -41,9 +41,7 @@ class Folder(Boxes):
         self.edge(y-2*r)
         self.corner(90, r)
         
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 f = Folder(240, 350, 20, 15)
 f.render()

lamp.py

@@ -109,9 +109,8 @@ class Lamp(Boxes):
 
         self.rectangularWall(x, h, edges='hFFF', holesMargin=5, move="right")
         self.rectangularWall(x, h, edges='hFFF', holesMargin=5)
-        self.ctx.stroke()
-        self.surface.finish()
 
+        self.close()
 
 l = Lamp()
 l.flexSettings = (3, 5.0, 20.0)

magazinefile.py

@@ -71,9 +71,7 @@ class Box(Boxes):
         self.moveTo(y+15, h+h2+15, 180)
         self.side(y, h, h2)
 
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 b = Box(80, 235, 300, 150)
 b.edges["f"].settings.setValues(b.thickness, space=2, finger=2)

printer.py

@@ -172,9 +172,7 @@ class Printer(Boxes):
                              callback=self.mainPlate, move="right")
                         
         self.head()
-
-        self.ctx.stroke()
-        self.surface.finish()
+        self.close()
 
 p = Printer()
 p.render()

silverwarebox.py

@@ -68,7 +68,6 @@ class Silverware(Boxes):
     def render(self, x, y, h, r):
         t = self.thickness
         b = self.burn
-        self.ctx.save()
 
         self.wall(x, y, h, r)
         self.centerWall(x,h)
@@ -80,10 +79,7 @@ class Silverware(Boxes):
         self.moveTo(-3.0*(l+2*t+8*b), h-10+2*t+8*b)
         self.basePlate(x, y, r)
 
-        self.ctx.restore()
-
-        self.ctx.stroke()
-        self.surface.finish()
+        self.close()
 
 b = Silverware(750, 350, thickness=5.0, burn=0.05)
 b.render(250, 250/1.618, 120, 30)

typetray.py

@@ -132,10 +132,7 @@ class TypeTray(Boxes):
                  TopEdge(self, self.x, 0.5*hi), "f"]
             self.rectangularWall(x, hi, e,
                                  move="up")
-
-        self.ctx.stroke()
-        self.surface.flush()
-        self.surface.finish()
+        self.close()
 
 x = 260 # outer width
 nx = 3