Merge pull request #279 from iXce/connection-rework

Connection rework, coding style rework

Merge pull request #279 from iXce/connection-rework
Connection rework, coding style rework
093f6a45 · kliment · 7e2e6a51 · 107280b8 · 093f6a45 · 093f6a45
Commit 093f6a45 authored Sep 05, 2012 by kliment
40 changed files
--- a/.gitignore
+++ b/.gitignore
 *.pyc
 .pronsolerc
+*.swp
+*.bak
--- a/README.cleanup
+++ b/README.cleanup
+Some cleanup commands :
+
+To add a space after each comma :
+sed -e "s/\(\w\),\(\w\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\),\(\"\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\"\),\(\w\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\"\),\(\"\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\([)}\]]\),\(\w\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\([)}\]]\),\([\[{(]\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\),\([\[{(]\)/\1, \2/g" -i *.py printrun/*.py printrun/svg/*.py
+
+To add spaces around each = :
+sed -e "s/\(\w\)=\(\w\)/\1 = \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\)=\(\"\)/\1 = \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\)=\((\)/\1 = \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\)=\((\)/\1 = \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\)=\([\[{(]\)/\1 = \2/g" -i *.py printrun/*.py printrun/svg/*.py
+
+To add spaces around each == :
+sed -e "s/\(\w\)==\(\w\)/\1 == \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\)==\(\"\)/\1 == \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\(\w\)==\((\)/\1 == \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\()\)==\(\w\)/\1 == \2/g" -i *.py printrun/*.py printrun/svg/*.py
+sed -e "s/\()\)==\((\)/\1 == \2/g" -i *.py printrun/*.py printrun/svg/*.py
+
+Obviously this is not a perfect solution, it WILL break the code. Juste check the diff and fix what's wrong before commiting.
--- a/README.i18n
+++ b/README.i18n
@@ -10,7 +10,7 @@ The pronterface.py now uses gettext for the messages it generates.
 The corresponding pronterface.pot file is at locale/pronterface.pot
 and was generated using 

-  pygettext -o locale/pronterface.pot pronterface.py
+  pygettext -o locale/pronterface.pot pronterface.py printrun/pronterface_widgets.py

 followed by minor edits to the generated header.

@@ -20,14 +20,14 @@ now there is only one, for German.  New ones can be created:
  # Create new pronterface message catalog for a different language
  newlang="es"  # use the correct code for your language
  mkdir -p locale/${newlang}/LC_MESSAGES
-  cp locale/pronterface.pot locale/${newlanguage}/LC_MESSAGES/${newlang}.po
-  cd locale/${newlanguage}/LC_MESSAGES/${newlang}
+  cp locale/pronterface.pot locale/${newlanguage}/LC_MESSAGES/pronterface.po
+  cd locale/${newlanguage}/LC_MESSAGES/
  # Edit the .po file to add messages for newlang
-  msgfmt -o ${newlang}.mo ${newlang}.po
+  msgfmt -o pronterface.mo pronterface.po

 To update a previously created message catalog from the template, use :

-  msgmerge -U locale/fr/LC_MESSAGES/${lang}.po locale/pronterface.pot
+  msgmerge -U locale/fr/LC_MESSAGES/pronterface.po locale/pronterface.pot

 As currently coded, the default location for these message catalogs is


--- a/locale/fr/LC_MESSAGES/plater.po
+++ b/locale/fr/LC_MESSAGES/plater.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plater\n"
-"POT-Creation-Date: 2012-02-26 02:40+CET\n"
+"POT-Creation-Date: 2012-08-04 21:53+CEST\n"
 "PO-Revision-Date: 2012-02-26 02:41+0100\n"
 "Last-Translator: Guillaume Seguin <guillaume@segu.in>\n"
 "Language-Team: FR <guillaume@segu.in>\n"
@@ -15,81 +15,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"

-#: plater.py:247
+#: plater.py:246
 msgid "Plate building tool"
 msgstr "Outil d'assemblage de plateau"

-#: plater.py:253
+#: plater.py:252
 msgid "Clear"
 msgstr "Vider"

-#: plater.py:254
+#: plater.py:253
 msgid "Load"
 msgstr "Charger"

-#: plater.py:256
+#: plater.py:255 plater.py:258
 msgid "Export"
 msgstr "Exporter"

-#: plater.py:259
+#: plater.py:260
 msgid "Done"
 msgstr "Terminé"

-#: plater.py:261
+#: plater.py:262
 msgid "Cancel"
 msgstr "Annuler"

-#: plater.py:263
+#: plater.py:264
 msgid "Snap to Z = 0"
 msgstr "Poser en Z = 0"

-#: plater.py:264
+#: plater.py:265
 msgid "Put at 100, 100"
 msgstr "Placer en 100, 100"

-#: plater.py:265
+#: plater.py:266
 msgid "Delete"
 msgstr "Supprimer"

-#: plater.py:266
+#: plater.py:267
 msgid "Auto"
 msgstr "Auto"

-#: plater.py:290
+#: plater.py:291
 msgid "Autoplating"
 msgstr "Placement auto"

-#: plater.py:318
+#: plater.py:319
 msgid "Bed full, sorry sir :("
 msgstr "Le lit est plein, désolé :("

-#: plater.py:328
+#: plater.py:329
 msgid ""
 "Are you sure you want to clear the grid? All unsaved changes will be lost."
 msgstr ""
 "Êtes vous sur de vouloir vider la grille ? Toutes les modifications non "
 "enregistrées seront perdues."

-#: plater.py:328
+#: plater.py:329
 msgid "Clear the grid?"
 msgstr "Vider la grille ?"

-#: plater.py:370
+#: plater.py:371
 msgid "Pick file to save to"
 msgstr "Choisir le fichier dans lequel enregistrer"

-#: plater.py:371
+#: plater.py:372
 msgid "STL files (;*.stl;*.STL;)"
 msgstr "Fichiers STL (;*.stl;*.STL;)"

-#: plater.py:391
+#: plater.py:393
 msgid "wrote %s"
 msgstr "%s écrit"

-#: plater.py:394
+#: plater.py:396
 msgid "Pick file to load"
 msgstr "Choisir le fichier à charger"

-#: plater.py:395
+#: plater.py:397
 msgid "STL files (;*.stl;*.STL;)|*.stl|OpenSCAD files (;*.scad;)|*.scad"
 msgstr "Fichiers STL (;*.stl;*.STL;)|*.stl|Fichiers OpenSCAD (;*.scad;)|*.scad"
--- a/locale/fr/LC_MESSAGES/pronterface.mo
+++ b/locale/fr/LC_MESSAGES/pronterface.mo
--- a/locale/fr/LC_MESSAGES/pronterface.po
+++ b/locale/fr/LC_MESSAGES/pronterface.po
--- a/locale/plater.pot
+++ b/locale/plater.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-26 02:40+CET\n"
+"POT-Creation-Date: 2012-08-04 21:53+CEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,79 +15,79 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"


-#: plater.py:247
+#: plater.py:246
 msgid "Plate building tool"
 msgstr ""

-#: plater.py:253
+#: plater.py:252
 msgid "Clear"
 msgstr ""

-#: plater.py:254
+#: plater.py:253
 msgid "Load"
 msgstr ""

-#: plater.py:256
+#: plater.py:255 plater.py:258
 msgid "Export"
 msgstr ""

-#: plater.py:259
+#: plater.py:260
 msgid "Done"
 msgstr ""

-#: plater.py:261
+#: plater.py:262
 msgid "Cancel"
 msgstr ""

-#: plater.py:263
+#: plater.py:264
 msgid "Snap to Z = 0"
 msgstr ""

-#: plater.py:264
+#: plater.py:265
 msgid "Put at 100, 100"
 msgstr ""

-#: plater.py:265
+#: plater.py:266
 msgid "Delete"
 msgstr ""

-#: plater.py:266
+#: plater.py:267
 msgid "Auto"
 msgstr ""

-#: plater.py:290
+#: plater.py:291
 msgid "Autoplating"
 msgstr ""

-#: plater.py:318
+#: plater.py:319
 msgid "Bed full, sorry sir :("
 msgstr ""

-#: plater.py:328
+#: plater.py:329
 msgid "Are you sure you want to clear the grid? All unsaved changes will be lost."
 msgstr ""

-#: plater.py:328
+#: plater.py:329
 msgid "Clear the grid?"
 msgstr ""

-#: plater.py:370
+#: plater.py:371
 msgid "Pick file to save to"
 msgstr ""

-#: plater.py:371
+#: plater.py:372
 msgid "STL files (;*.stl;*.STL;)"
 msgstr ""

-#: plater.py:391
+#: plater.py:393
 msgid "wrote %s"
 msgstr ""

-#: plater.py:394
+#: plater.py:396
 msgid "Pick file to load"
 msgstr ""

-#: plater.py:395
+#: plater.py:397
 msgid "STL files (;*.stl;*.STL;)|*.stl|OpenSCAD files (;*.scad;)|*.scad"
 msgstr ""

--- a/locale/pronterface.pot
+++ b/locale/pronterface.pot
--- a/plater.py
+++ b/plater.py
@@ -46,7 +46,7 @@ def evalme(s):


 class stlwrap:
-    def __init__(self, obj, name=None):
+    def __init__(self, obj, name = None):
        self.obj = obj
        self.name = name
        if name is None:
@@ -58,7 +58,7 @@ class stlwrap:

 class showstl(wx.Window):
    def __init__(self, parent, size, pos):
-        wx.Window.__init__(self, parent, size=size, pos=pos)
+        wx.Window.__init__(self, parent, size = size, pos = pos)
        #self.SetBackgroundColour((0, 0, 0))
        #wx.FutureCall(200, self.paint)
        self.i = 0
@@ -141,7 +141,7 @@ class showstl(wx.Window):
        self.i += angle
        if not self.triggered:
            self.triggered = 1
-            threading.Thread(target=self.cr).start()
+            threading.Thread(target = self.cr).start()

    def keypress(self, event):
        """gets keypress events and moves/rotates acive shape"""
@@ -200,9 +200,9 @@ class showstl(wx.Window):

    def repaint(self, event):
        dc = wx.PaintDC(self)
-        self.paint(dc=dc)
+        self.paint(dc = dc)

-    def paint(self, coord1="x", coord2="y", dc=None):
+    def paint(self, coord1 = "x", coord2 = "y", dc = None):
        coords = {"x": 0, "y": 1, "z": 2}
        if dc is None:
            dc = wx.ClientDC(self)
@@ -231,7 +231,7 @@ class showstl(wx.Window):
            bm = wx.BitmapFromImage(im)
            dcs.SelectObject(bm)
            bsz = bm.GetSize()
-            dc.Blit(scale * m.offsets[0] - bsz[0] / 2, 400 - (scale * m.offsets[1] + bsz[1] / 2), bsz[0], bsz[1], dcs, 0, 0, useMask=1)
+            dc.Blit(scale * m.offsets[0] - bsz[0] / 2, 400 - (scale * m.offsets[1] + bsz[1] / 2), bsz[0], bsz[1], dcs, 0, 0, useMask = 1)
            #for i in m.facets:#random.sample(m.facets, min(100000, len(m.facets))):
            #    dc.DrawPolygon([wx.Point(offset[0]+scale*m.offsets[0]+scale*p[0], 400-(offset[1]+scale*m.offsets[1]+scale*p[1])) for p in i[1]])
                #if(time.time()-t)>5:
@@ -242,29 +242,29 @@ class showstl(wx.Window):


 class stlwin(wx.Frame):
-    def __init__(self, size=(800, 580), callback=None, parent=None):
-        wx.Frame.__init__(self, parent, title=_("Plate building tool"), size=size)
+    def __init__(self, size = (800, 580), callback = None, parent = None):
+        wx.Frame.__init__(self, parent, title = _("Plate building tool"), size = size)
        self.SetIcon(wx.Icon(pixmapfile("plater.ico"), wx.BITMAP_TYPE_ICO))
        self.mainsizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.panel = wx.Panel(self, -1, size=(150, 600), pos=(0, 0))
+        self.panel = wx.Panel(self, -1, size = (150, 600), pos = (0, 0))
        #self.panel.SetBackgroundColour((10, 10, 10))
-        self.l = wx.ListBox(self.panel, size=(300, 180), pos=(0, 30))
-        self.cl = wx.Button(self.panel, label=_("Clear"), pos=(0, 205))
-        self.lb = wx.Button(self.panel, label=_("Load"), pos=(0, 0))
+        self.l = wx.ListBox(self.panel, size = (300, 180), pos = (0, 30))
+        self.cl = wx.Button(self.panel, label = _("Clear"), pos = (0, 205))
+        self.lb = wx.Button(self.panel, label = _("Load"), pos = (0, 0))
        if(callback is None):
-            self.eb = wx.Button(self.panel, label=_("Export"), pos=(100, 0))
+            self.eb = wx.Button(self.panel, label = _("Export"), pos = (100, 0))
            self.eb.Bind(wx.EVT_BUTTON, self.export)
        else:
-            self.eb = wx.Button(self.panel, label=_("Export"), pos=(200, 205))
+            self.eb = wx.Button(self.panel, label = _("Export"), pos = (200, 205))
            self.eb.Bind(wx.EVT_BUTTON, self.export)
-            self.edb = wx.Button(self.panel, label=_("Done"), pos=(100, 0))
+            self.edb = wx.Button(self.panel, label = _("Done"), pos = (100, 0))
            self.edb.Bind(wx.EVT_BUTTON, lambda e: self.done(e, callback))
-            self.eb = wx.Button(self.panel, label=_("Cancel"), pos=(200, 0))
+            self.eb = wx.Button(self.panel, label = _("Cancel"), pos = (200, 0))
            self.eb.Bind(wx.EVT_BUTTON, lambda e: self.Destroy())
-        self.sb = wx.Button(self.panel, label=_("Snap to Z = 0"), pos=(00, 255))
-        self.cb = wx.Button(self.panel, label=_("Put at 100, 100"), pos=(0, 280))
-        self.db = wx.Button(self.panel, label=_("Delete"), pos=(0, 305))
-        self.ab = wx.Button(self.panel, label=_("Auto"), pos=(0, 330))
+        self.sb = wx.Button(self.panel, label = _("Snap to Z = 0"), pos = (00, 255))
+        self.cb = wx.Button(self.panel, label = _("Put at 100, 100"), pos = (0, 280))
+        self.db = wx.Button(self.panel, label = _("Delete"), pos = (0, 305))
+        self.ab = wx.Button(self.panel, label = _("Auto"), pos = (0, 330))
        self.cl.Bind(wx.EVT_BUTTON, self.clear)
        self.lb.Bind(wx.EVT_BUTTON, self.right)
        self.sb.Bind(wx.EVT_BUTTON, self.snap)
@@ -368,7 +368,7 @@ class stlwin(wx.Frame):
        self.Destroy()

    def export(self, event):
-        dlg = wx.FileDialog(self, _("Pick file to save to"), self.basedir, style=wx.FD_SAVE)
+        dlg = wx.FileDialog(self, _("Pick file to save to"), self.basedir, style = wx.FD_SAVE)
        dlg.SetWildcard(_("STL files (;*.stl;*.STL;)"))
        if(dlg.ShowModal() == wx.ID_OK):
            name = dlg.GetPath()
@@ -393,7 +393,7 @@ class stlwin(wx.Frame):
        print _("wrote %s") % name

    def right(self, event):
-        dlg = wx.FileDialog(self, _("Pick file to load"), self.basedir, style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
+        dlg = wx.FileDialog(self, _("Pick file to load"), self.basedir, style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
        dlg.SetWildcard(_("STL files (;*.stl;*.STL;)|*.stl|OpenSCAD files (;*.scad;)|*.scad"))
        if(dlg.ShowModal() == wx.ID_OK):
            name = dlg.GetPath()
@@ -443,7 +443,7 @@ class stlwin(wx.Frame):
        self.Refresh()
        #print time.time()-t

-    def load_stl_into_model(self, path, name, offset=[0, 0, 0], rotation=0, scale=[1.0, 1.0, 1.0]):
+    def load_stl_into_model(self, path, name, offset = [0, 0, 0], rotation = 0, scale = [1.0, 1.0, 1.0]):
        newname = os.path.split(name.lower())[1]
        c = 1
        while newname in self.models:

--- a/printrun/printcore.py
+++ b/printrun/printcore.py
--- a/printrun/SkeinforgeQuickEditDialog.py
+++ b/printrun/SkeinforgeQuickEditDialog.py
@@ -35,7 +35,7 @@ class SkeinforgeQuickEditDialog(wx.Dialog):
                                'speed':['Main Feed Rate (mm/s):','Main Flow Rate  (scaler):','Perimeter Feed Rate (mm/s):','Perimeter Flow Rate (scaler):','Travel Feed Rate (mm/s):']
                               }

-        self.scrollbarPanel = wx.ScrolledWindow(self, -1, style=wx.TAB_TRAVERSAL)
+        self.scrollbarPanel = wx.ScrolledWindow(self, -1, style = wx.TAB_TRAVERSAL)
        self.settingsSizer = self.getProfileSettings()
        self.scrollbarPanel.SetSizer(self.settingsSizer)

@@ -67,7 +67,7 @@ class SkeinforgeQuickEditDialog(wx.Dialog):
        self.Layout()

    def getProfileSettings(self):
-        settingsSizer = wx.GridBagSizer(hgap=2, vgap=1)
+        settingsSizer = wx.GridBagSizer(hgap = 2, vgap = 1)
        settingsRow = 0

        for craftName in sorted(self.moduleSettingsMap.keys()):
@@ -86,28 +86,28 @@ class SkeinforgeQuickEditDialog(wx.Dialog):
            for setting in settings.getReadRepository(repo).preferences:
                if setting.name in self.moduleSettingsMap[craftName]:

-                    settingSizer = wx.GridBagSizer(hgap=2, vgap=2)
+                    settingSizer = wx.GridBagSizer(hgap = 2, vgap = 2)
                    settingSizer.AddGrowableCol(0)
                    settingRow = 0
                    settingLabel = wx.StaticText(self.scrollbarPanel, -1, setting.name)
                    settingLabel.Wrap(400)
-                    settingSizer.Add(settingLabel, pos=(settingRow, 0))
+                    settingSizer.Add(settingLabel, pos = (settingRow, 0))

                    if (isinstance(setting.value, bool)):
                        checkbox = wx.CheckBox(self.scrollbarPanel)
                        checkbox.SetName(craftName + '.' + setting.name)
                        checkbox.SetValue(setting.value)
-                        settingSizer.Add(checkbox, pos=(settingRow, 1))
-                        settingSizer.AddSpacer((25, -1), pos=(settingRow, 2))
+                        settingSizer.Add(checkbox, pos = (settingRow, 1))
+                        settingSizer.AddSpacer((25, -1), pos = (settingRow, 2))
                    else:
-                        textCtrl = wx.TextCtrl(self.scrollbarPanel, value=str(setting.value), size=(50, -1))
+                        textCtrl = wx.TextCtrl(self.scrollbarPanel, value = str(setting.value), size = (50, -1))
                        textCtrl.SetName(craftName + '.' + setting.name)
-                        settingSizer.Add(textCtrl, pos=(settingRow, 1))
+                        settingSizer.Add(textCtrl, pos = (settingRow, 1))

                    craftStaticBoxSizer.Add(settingSizer, 1, wx.EXPAND, 0)
                    settingRow += 1
            col = settingsRow % 2
-            settingsSizer.Add(craftStaticBoxSizer, pos=(settingsRow - col, col))
+            settingsSizer.Add(craftStaticBoxSizer, pos = (settingsRow - col, col))
            settingsRow += 1

        return settingsSizer

--- a/printrun/bmpDisplay.py
+++ b/printrun/bmpDisplay.py
@@ -11,7 +11,7 @@ import shutil

 class MyFrame(wx.Frame):
    def __init__(self, parent, mysize):
-        wx.Frame.__init__(self, parent, wx.ID_ANY, size=mysize)
+        wx.Frame.__init__(self, parent, wx.ID_ANY, size = mysize)
        self.SetBackgroundColour('black')

        # milliseconds per frame
@@ -49,7 +49,7 @@ class MyFrame(wx.Frame):
        if self.mytmpdir:
            shutil.rmtree(self.mytmpdir)

-    def onPaint(self, event=None):
+    def onPaint(self, event = None):
        # this is the wxPython drawing surface/canvas
        dc = wx.PaintDC(self)
        while self.loops:
@@ -59,7 +59,7 @@ class MyFrame(wx.Frame):
                w, h = bmp.GetSize()
                info = "%s  %dx%d" % (self.name_list[ix], w, h)
                self.SetTitle(info)
-                #self.SetSize((w,h))
+                #self.SetSize((w, h))
                # draw the image
                dc.DrawBitmap(bmp, 0, 0, True)
                wx.MilliSleep(self.delay)

--- a/printrun/bufferedcanvas.py
+++ b/printrun/bufferedcanvas.py
@@ -66,10 +66,10 @@ class BufferedCanvas(wx.Panel):
    def __init__(self,
                 parent,
                 ID=-1,
-                 pos=wx.DefaultPosition,
-                 size=wx.DefaultSize,
-                 style=wx.NO_FULL_REPAINT_ON_RESIZE|wx.WANTS_CHARS):
-        wx.Panel.__init__(self,parent,ID,pos,size,style)
+                 pos = wx.DefaultPosition,
+                 size = wx.DefaultSize,
+                 style = wx.NO_FULL_REPAINT_ON_RESIZE|wx.WANTS_CHARS):
+        wx.Panel.__init__(self, parent, ID, pos, size, style)

        # Bind events
        self.Bind(wx.EVT_PAINT, self.onPaint)
@@ -83,7 +83,7 @@ class BufferedCanvas(wx.Panel):
    ## General methods
    ##

-    def draw(self,dc):
+    def draw(self, dc):
        """
        Stub: called when the canvas needs to be re-drawn.
        """
@@ -96,7 +96,7 @@ class BufferedCanvas(wx.Panel):
        self.Refresh()

    def getWidthHeight(self):
-        width,height = self.GetClientSizeTuple()
+        width, height = self.GetClientSizeTuple()
        if width == 0:
            width = 1
        if height == 0:

--- a/printrun/calibrateextruder.py
+++ b/printrun/calibrateextruder.py
@@ -2,36 +2,36 @@
 #Interactive RepRap e axis calibration program
 #(C) Nathan Zadoks 2011
 #Licensed under CC-BY-SA or GPLv2 and higher - Pick your poison.
-s=300			#Extrusion speed (mm/min)
-n=100			#Default length to extrude
+s = 300                   #Extrusion speed (mm/min)
+n = 100                   #Default length to extrude
 m=  0                   #User-entered measured extrusion length
-k=300			#Default amount of steps per mm
+k = 300                   #Default amount of steps per mm
 port='/dev/ttyUSB0'     #Default serial port to connect to printer
-temp=210		#Default extrusion temperature
+temp = 210                #Default extrusion temperature

-tempmax=250		#Maximum extrusion temperature
+tempmax = 250             #Maximum extrusion temperature

-t=int(n*60)/s #Time to wait for extrusion
+t = int(n*60)/s #Time to wait for extrusion

 try:
    from printdummy import printcore
 except ImportError:
    from printcore import printcore
-import time,getopt,sys,os
+import time, getopt, sys, os

 def float_input(prompt=''):
    import sys
-	f=None
-	while f==None:
-		s=raw_input(prompt)
+    f = None
+    while f == None:
+        s = raw_input(prompt)
        try:
-			f=float(s)
+            f = float(s)
        except ValueError:
            sys.stderr.write("Not a valid floating-point number.\n")
            sys.stderr.flush()
    return f
-def wait(t,m=''):
-	import time,sys
+def wait(t, m=''):
+    import time, sys
    sys.stdout.write(m+'['+(' '*t)+']\r'+m+'[')
    sys.stdout.flush()
    for i in range(t):
@@ -45,19 +45,19 @@ def w(s):
    sys.stdout.flush()


-def heatup(p,temp,s=0):
-	curtemp=gettemp(p)
+def heatup(p, temp, s = 0):
+    curtemp = gettemp(p)
    p.send_now('M109 S%03d'%temp)
-	p.temp=0
+    p.temp = 0
    if not s: w("Heating extruder up..")
-	f=False
+    f = False
    while curtemp<=(temp-1):
        p.send_now('M105')
        time.sleep(0.5)
        if not f:
            time.sleep(1.5)
-			f=True
-		curtemp=gettemp(p)
+            f = True
+        curtemp = gettemp(p)
        if curtemp: w(u"\rHeating extruder up.. %3d \xb0C"%curtemp)
    if s: print
    else: print "\nReady."
@@ -67,47 +67,47 @@ def gettemp(p):
    except: setattr(p,'logl',0)
    try: p.temp
    except: setattr(p,'temp',0)
-	for n in range(p.logl,len(p.log)):
-		line=p.log[n]
+    for n in range(p.logl, len(p.log)):
+        line = p.log[n]
        if 'T:' in line:
            try:
                setattr(p,'temp',int(line.split('T:')[1].split()[0]))
            except: print line
-	p.logl=len(p.log)
+    p.logl = len(p.log)
    return p.temp
 if not os.path.exists(port):
-	port=0
+    port = 0

 #Parse options
-help=u"""
+help = u"""
 %s [ -l DISTANCE ] [ -s STEPS ] [ -t TEMP ] [ -p PORT ]
        -l      --length        Length of filament to extrude for each calibration step (default: %d mm)
        -s      --steps         Initial amount of steps to use (default: %d steps)
        -t      --temp          Extrusion temperature in degrees Celsius (default: %d \xb0C, max %d \xb0C)
        -p      --port          Serial port the printer is connected to (default: %s)
        -h      --help          This cruft.
-"""[1:-1].encode('utf-8')%(sys.argv[0],n,k,temp,tempmax,port if port else 'auto')
+"""[1:-1].encode('utf-8')%(sys.argv[0], n, k, temp, tempmax, port if port else 'auto')
 try:
-	opts,args=getopt.getopt(sys.argv[1:],"hl:s:t:p:",["help","length=","steps=","temp=","port="])
-except getopt.GetoptError,err:
+    opts, args = getopt.getopt(sys.argv[1:],"hl:s:t:p:",["help", "length=", "steps=", "temp=", "port="])
+except getopt.GetoptError, err:
    print str(err)
    print help
    sys.exit(2)
-for o,a in opts:
+for o, a in opts:
    if o in ('-h','--help'):
        print help
        sys.exit()
    elif o in ('-l','--length'):
-		n=float(a)
+        n = float(a)
    elif o in ('-s','--steps'):
-		k=int(a)
+        k = int(a)
    elif o in ('-t','--temp'):
-		temp=int(a)
+        temp = int(a)
        if temp>=tempmax:
            print (u'%d \xb0C? Are you insane?'.encode('utf-8')%temp)+(" That's over nine thousand!" if temp>9000 else '')
            sys.exit(255)
    elif o in ('-p','--port'):
-		port=a
+        port = a

 #Show initial parameters
 print "Initial parameters"
@@ -116,12 +116,12 @@ print "Length extruded: %3d mm"%n
 print
 print "Serial port:     %s"%(port if port else 'auto')

-p=None
+p = None
 try:
    #Connect to printer
    w("Connecting to printer..")
    try:
-		p=printcore(port,115200)
+        p = printcore(port, 115200)
    except:
        print 'Error.'
        raise
@@ -130,18 +130,18 @@ try:
        w('.')
    print " connected."

-	heatup(p,temp)
+    heatup(p, temp)

    #Calibration loop
    while n!=m:
-		heatup(p,temp,True)
+        heatup(p, temp, True)
        p.send_now("G92 E0")                    #Reset e axis
-		p.send_now("G1 E%d F%d"%(n,s))	#Extrude length of filament
+        p.send_now("G1 E%d F%d"%(n, s))  #Extrude length of filament
        wait(t,'Extruding.. ')
-		m=float_input("How many millimeters of filament were extruded? ")
-		if m==0: continue
+        m = float_input("How many millimeters of filament were extruded? ")
+        if m == 0: continue
        if n!=m:
-			k=(n/m)*k
+            k = (n/m)*k
            p.send_now("M92 E%d"%int(round(k)))     #Set new step count
            print "Steps per mm:    %3d steps"%k    #Tell user
    print 'Calibration completed.'  #Yay!

--- a/printrun/gcview.py
+++ b/printrun/gcview.py
@@ -19,8 +19,8 @@ import threading
 class GLPanel(wx.Panel):
    '''A simple class for using OpenGL with wxPython.'''

-    def __init__(self, parent, id, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=0):
+    def __init__(self, parent, id, pos = wx.DefaultPosition,
+                 size = wx.DefaultSize, style = 0):
        # Forcing a no full repaint to stop flickering
        style = style | wx.NO_FULL_REPAINT_ON_RESIZE
        #call super function
@@ -33,7 +33,7 @@ class GLPanel(wx.Panel):
                      glcanvas.WX_GL_DEPTH_SIZE, 24)  # 24 bit
        # Create the canvas
        self.sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.canvas = glcanvas.GLCanvas(self, attribList=attribList)
+        self.canvas = glcanvas.GLCanvas(self, attribList = attribList)
        self.sizer.Add(self.canvas, 1, wx.EXPAND)
        self.SetSizer(self.sizer)
        #self.sizer.Fit(self)
@@ -200,7 +200,7 @@ def _dist(dist):
 class gcpoint(object):
    """gcode point
    stub for first line"""
-    def __init__(self, x=0,y=0,z=0,e=0):
+    def __init__(self, x = 0, y = 0, z = 0, e = 0):
        self.x = x
        self.y = y
        self.z = z
@@ -210,10 +210,10 @@ class gcpoint(object):

 class gcline(object):
    """gcode move line
-    Once initialised,it knows its position, length and extrusion ratio
+    Once initialised, it knows its position, length and extrusion ratio
    Returns lines into gcview batch()
    """
-    def __init__(self, x=None, y=None, z=None, e=None, f=None, prev_gcline=None, orgline = False):
+    def __init__(self, x = None, y = None, z = None, e = None, f = None, prev_gcline = None, orgline = False):
        if prev_gcline is None:
            self.prev_gcline = gcpoint()
        else:
@@ -255,7 +255,7 @@ class gcline(object):
                self.orgline,
            )

-    def calc_delta(self, prev_gcline=None):
+    def calc_delta(self, prev_gcline = None):
        if prev_gcline is None:
            prev_gcline = self.prev_gcline
        if self.prev_gcline is not None:
@@ -290,7 +290,7 @@ class gcline(object):
            ]
    def glcolor(self, upper_limit = None, lower_limit = 0, max_feedrate = 0):
        if self.extrusion_ratio == 0:
-            return [255,255,255,0,0,0]
+            return [255, 255, 255, 0, 0, 0]
        else:
            blue_color = 0
            green_color = 0
@@ -312,7 +312,7 @@ class gcline(object):
                blue_color = 255
            if blue_color < 0:
                blue_color = 0
-            return[255,green_color,blue_color,128,green_color,blue_color/4]
+            return[255, green_color, blue_color, 128, green_color, blue_color/4]


 def float_from_line(axe, line):
@@ -340,7 +340,7 @@ class gcview(object):
    """gcode visualiser
    Holds opengl objects for all layers
    """
-    def __init__(self, lines, batch, w=0.5, h=0.5):
+    def __init__(self, lines, batch, w = 0.5, h = 0.5):
        if len(lines) == 0:
            return
        print "Loading %s lines" % (len(lines))
@@ -430,7 +430,7 @@ class gcview(object):
                    else:
                        self.lastf = cur[4]

-                    r = gcline(x=cur[0], y=cur[1], z=cur[2],e=cur[3], f=cur[4], prev_gcline=self.prev, orgline=orgline)
+                    r = gcline(x = cur[0], y = cur[1], z = cur[2], e = cur[3], f = cur[4], prev_gcline = self.prev, orgline = orgline)
                    self.prev = r
                    return r
            return None
@@ -524,7 +524,7 @@ def mulquat(q1, rq):

 class TestGlPanel(GLPanel):

-    def __init__(self, parent, size, id=wx.ID_ANY):
+    def __init__(self, parent, size, id = wx.ID_ANY):
        super(TestGlPanel, self).__init__(parent, id, wx.DefaultPosition, size, 0)
        self.batches = []
        self.rot = 0
@@ -553,7 +553,7 @@ class TestGlPanel(GLPanel):
    def forceresize(self):
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] + 1))
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] - 1))
-        threading.Thread(target=self.update).start()
+        threading.Thread(target = self.update).start()
        self.initialized = 0

    def move_shape(self, delta):
@@ -605,7 +605,7 @@ class TestGlPanel(GLPanel):
                p1y = -(float(p1[1]) - sz[1] / 2) / (sz[1] / 2)
                p2x = (float(p2[0]) - sz[0] / 2) / (sz[0] / 2)
                p2y = -(float(p2[1]) - sz[1] / 2) / (sz[1] / 2)
-                #print p1x,p1y,p2x,p2y
+                #print p1x, p1y, p2x, p2y
                quat = trackball(p1x, p1y, p2x, p2y, -self.transv[2] / 250.0)
                if self.rot:
                    self.basequat = mulquat(self.basequat, quat)
@@ -768,7 +768,7 @@ class TestGlPanel(GLPanel):

    def drawmodel(self, m, n):
        batch = pyglet.graphics.Batch()
-        stl = stlview(m.facets, batch=batch)
+        stl = stlview(m.facets, batch = batch)
        m.batch = batch
        m.animoffset = 300
        #print m
@@ -907,8 +907,8 @@ class TestGlPanel(GLPanel):
 class GCFrame(wx.Frame):
    '''A simple class for using OpenGL with wxPython.'''

-    def __init__(self, parent, ID, title, pos=wx.DefaultPosition,
-            size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE):
+    def __init__(self, parent, ID, title, pos = wx.DefaultPosition,
+            size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE):
        super(GCFrame, self).__init__(parent, ID, title, pos, (size[0] + 150, size[1]), style)

        class d:
@@ -921,22 +921,22 @@ class GCFrame(wx.Frame):
        m.curlayer = -1
        m.scale = [1.0, 1.0, 1.0]
        m.batch = pyglet.graphics.Batch()
-        m.gc = gcview([], batch=m.batch)
+        m.gc = gcview([], batch = m.batch)
        self.models = {"GCODE": m}
        self.l = d()
        self.modelindex = 0
        self.GLPanel1 = TestGlPanel(self, size)

-    def addfile(self, gcode=[]):
+    def addfile(self, gcode = []):
        self.models["GCODE"].gc.delete()
-        self.models["GCODE"].gc = gcview(gcode, batch=self.models["GCODE"].batch)
+        self.models["GCODE"].gc = gcview(gcode, batch = self.models["GCODE"].batch)
        self.setlayerindex(None)

    def clear(self):
        self.models["GCODE"].gc.delete()
-        self.models["GCODE"].gc = gcview([], batch=self.models["GCODE"].batch)
+        self.models["GCODE"].gc = gcview([], batch = self.models["GCODE"].batch)

-    def Show(self, arg=True):
+    def Show(self, arg = True):
        wx.Frame.Show(self, arg)
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] + 1))
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] - 1))
@@ -975,8 +975,8 @@ class GCFrame(wx.Frame):


 def main():
-    app = wx.App(redirect=False)
-    frame = GCFrame(None, wx.ID_ANY, 'Gcode view, shift to move view, mousewheel to set layer', size=(400, 400))
+    app = wx.App(redirect = False)
+    frame = GCFrame(None, wx.ID_ANY, 'Gcode view, shift to move view, mousewheel to set layer', size = (400, 400))
    import sys
    for filename in sys.argv:
        if ".gcode" in filename:
@@ -985,8 +985,8 @@ def main():
            #TODO: add stl here
            pass

-    #frame = wx.Frame(None, -1, "GL Window", size=(400, 400))
-    #panel = TestGlPanel(frame, size=(300,300))
+    #frame = wx.Frame(None, -1, "GL Window", size = (400, 400))
+    #panel = TestGlPanel(frame, size = (300, 300))
    frame.Show(True)
    app.MainLoop()
    app.Destroy()

--- a/printrun/graph.py
+++ b/printrun/graph.py
@@ -22,8 +22,8 @@ from bufferedcanvas import *
 class Graph(BufferedCanvas):
    '''A class to show a Graph with Pronterface.'''

-    def __init__(self, parent, id, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=0):
+    def __init__(self, parent, id, pos = wx.DefaultPosition,
+                 size = wx.DefaultSize, style = 0):
        # Forcing a no full repaint to stop flickering
        style = style | wx.NO_FULL_REPAINT_ON_RESIZE
        #call super function
@@ -53,7 +53,7 @@ class Graph(BufferedCanvas):


        #self.sizer = wx.BoxSizer(wx.HORIZONTAL)
-        #self.sizer.Add(wx.Button(self, -1, "Button1", (0,0)))
+        #self.sizer.Add(wx.Button(self, -1, "Button1", (0, 0)))
        #self.SetSizer(self.sizer)


@@ -78,23 +78,23 @@ class Graph(BufferedCanvas):


    def drawgrid(self, dc, gc):
-        #cold,medium,hot = wx.Colour(0,167,223),wx.Colour(239,233,119),wx.Colour(210,50.100)
-        #col1 = wx.Colour(255,0,0, 255)
-        #col2 = wx.Colour(255,255,255, 128)
+        #cold, medium, hot = wx.Colour(0, 167, 223), wx.Colour(239, 233, 119), wx.Colour(210, 50.100)
+        #col1 = wx.Colour(255, 0, 0, 255)
+        #col2 = wx.Colour(255, 255, 255, 128)

        #b = gc.CreateLinearGradientBrush(0, 0, w, h, col1, col2)

-        gc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 4))
-        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(245,245,255,252))))
+        gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 4))
+        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(245, 245, 255, 252))))
        #gc.SetBrush(b)
        gc.DrawRectangle(0, 0, self.width, self.height)

-        #gc.SetBrush(wx.Brush(wx.Colour(245,245,255,52)))
+        #gc.SetBrush(wx.Brush(wx.Colour(245, 245, 255, 52)))

-        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(0,0,0,255))))
-        #gc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 4))
+        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(0, 0, 0, 255))))
+        #gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 4))

-        #gc.DrawLines(wx.Point(0,0), wx.Point(50,10))
+        #gc.DrawLines(wx.Point(0, 0), wx.Point(50, 10))

        #path = gc.CreatePath()
        #path.MoveToPoint(0.0, 0.0)
@@ -107,34 +107,34 @@ class Graph(BufferedCanvas):


        font = wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD)
-        gc.SetFont(font, wx.Colour(23,44,44))
+        gc.SetFont(font, wx.Colour(23, 44, 44))

-        dc.SetPen(wx.Pen(wx.Colour(225,225,225), 1))
+        dc.SetPen(wx.Pen(wx.Colour(225, 225, 225), 1))
        for x in range(self.xbars):
            dc.DrawLine(x*(float(self.width)/self.xbars), 0, x*(float(self.width)/self.xbars), self.height)

-        dc.SetPen(wx.Pen(wx.Colour(225,225,225), 1))
+        dc.SetPen(wx.Pen(wx.Colour(225, 225, 225), 1))
        for y in range(self.ybars):
            y_pos = y*(float(self.height)/self.ybars)
-            dc.DrawLine(0,y_pos, self.width,y_pos)
+            dc.DrawLine(0, y_pos, self.width, y_pos)
            gc.DrawText(unicode(int(self.maxyvalue - (y * (self.maxyvalue/self.ybars)))), 1, y_pos - (font.GetPointSize() / 2))

        if self.timer.IsRunning() == False:
            font = wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD)
-            gc.SetFont(font, wx.Colour(3,4,4))
+            gc.SetFont(font, wx.Colour(3, 4, 4))
            gc.DrawText("Graph offline", self.width/2 - (font.GetPointSize() * 3), self.height/2 - (font.GetPointSize() * 1))

-        #dc.DrawCircle(50,50, 1)
+        #dc.DrawCircle(50, 50, 1)

-        #gc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 1))
-        #gc.DrawLines([[20,30], [10,53]])
-        #dc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 1))
+        #gc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))
+        #gc.DrawLines([[20, 30], [10, 53]])
+        #dc.SetPen(wx.Pen(wx.Colour(255, 0, 0, 0), 1))

    def drawtemperature(self, dc, gc, temperature_list, text, text_xoffset, r, g, b, a):
        if self.timer.IsRunning() == False:
-            dc.SetPen(wx.Pen(wx.Colour(128,128,128,128), 1))
+            dc.SetPen(wx.Pen(wx.Colour(128, 128, 128, 128), 1))
        else:
-            dc.SetPen(wx.Pen(wx.Colour(r,g,b,a), 1))
+            dc.SetPen(wx.Pen(wx.Colour(r, g, b, a), 1))

        x_add = float(self.width)/self.xsteps
        x_pos = float(0.0)
@@ -143,7 +143,7 @@ class Graph(BufferedCanvas):
        for temperature in (temperature_list):
            y_pos = int((float(self.height-self.y_offset)/self.maxyvalue)*temperature) + self.y_offset
            if (x_pos > 0.0): # One need 2 points to draw a line.
-                dc.DrawLine(lastxvalue,self.height-self._lastyvalue, x_pos, self.height-y_pos)
+                dc.DrawLine(lastxvalue, self.height-self._lastyvalue, x_pos, self.height-y_pos)

            lastxvalue = x_pos
            x_pos = float(x_pos) + x_add
@@ -153,9 +153,9 @@ class Graph(BufferedCanvas):
            font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD)
            #font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
            if self.timer.IsRunning() == False:
-                gc.SetFont(font, wx.Colour(128,128,128))
+                gc.SetFont(font, wx.Colour(128, 128, 128))
            else:
-                gc.SetFont(font, wx.Colour(r,g,b))
+                gc.SetFont(font, wx.Colour(r, g, b))

            #gc.DrawText(text, self.width - (font.GetPointSize() * ((len(text) * text_xoffset + 1))), self.height - self._lastyvalue - (font.GetPointSize() / 2))
            gc.DrawText(text, x_pos - x_add - (font.GetPointSize() * ((len(text) * text_xoffset + 1))), self.height - self._lastyvalue - (font.GetPointSize() / 2))
@@ -163,24 +163,24 @@ class Graph(BufferedCanvas):


    def drawbedtemp(self, dc, gc):
-        self.drawtemperature(dc, gc, self.bedtemps, "Bed",2, 255,0,0, 128)
+        self.drawtemperature(dc, gc, self.bedtemps, "Bed", 2, 255, 0, 0, 128)

    def drawbedtargettemp(self, dc, gc):
-        self.drawtemperature(dc, gc, self.bedtargettemps, "Bed Target",2, 255,120,0, 128)
+        self.drawtemperature(dc, gc, self.bedtargettemps, "Bed Target", 2, 255, 120, 0, 128)


    def drawextruder0temp(self, dc, gc):
-        self.drawtemperature(dc, gc, self.extruder0temps, "Ex0",1, 0,155,255, 128)
+        self.drawtemperature(dc, gc, self.extruder0temps, "Ex0", 1, 0, 155, 255, 128)

    def drawextruder0targettemp(self, dc, gc):
-        self.drawtemperature(dc, gc, self.extruder0targettemps, "Ex0 Target",2, 0,5,255, 128)
+        self.drawtemperature(dc, gc, self.extruder0targettemps, "Ex0 Target", 2, 0, 5, 255, 128)


    def drawextruder1temp(self, dc, gc):
-        self.drawtemperature(dc, gc, self.extruder1temps, "Ex1",3, 55,55,0, 128)
+        self.drawtemperature(dc, gc, self.extruder1temps, "Ex1", 3, 55, 55, 0, 128)

    def drawextruder1targettemp(self, dc, gc):
-        self.drawtemperature(dc, gc, self.extruder1targettemps, "Ex1 Target",2, 55,55,0, 128)
+        self.drawtemperature(dc, gc, self.extruder1targettemps, "Ex1 Target", 2, 55, 55, 0, 128)


    def SetBedTemperature(self, value):
@@ -263,5 +263,3 @@ class Graph(BufferedCanvas):
        self.drawextruder0temp(dc, gc)
        self.drawextruder1targettemp(dc, gc)
        self.drawextruder1temp(dc, gc)
-
-
--- a/printrun/gviz.py
+++ b/printrun/gviz.py
--- a/printrun/printrun_utils.py
+++ b/printrun/printrun_utils.py
 import os
 import gettext

+# Set up Internationalization using gettext
+# searching for installed locales on /usr/share; uses relative folder if not found (windows)
 def install_locale(domain):
    if os.path.exists('/usr/share/pronterface/locale'):
-        gettext.install(domain, '/usr/share/pronterface/locale', unicode=1)
+        gettext.install(domain, '/usr/share/pronterface/locale', unicode = 1)
    elif os.path.exists('/usr/local/share/pronterface/locale'):
-        gettext.install(domain, '/usr/local/share/pronterface/locale', unicode=1)
+        gettext.install(domain, '/usr/local/share/pronterface/locale', unicode = 1)
    else:
-        gettext.install(domain, './locale', unicode=1)
+        gettext.install(domain, './locale', unicode = 1)

 def imagefile(filename):
    for prefix in ['/usr/local/share/pronterface/images', '/usr/share/pronterface/images']:

--- a/printrun/projectlayer.py
+++ b/printrun/projectlayer.py
@@ -23,8 +23,8 @@ import svg.document as wxpsvgdocument
 import imghdr

 class dispframe(wx.Frame):
-    def __init__(self, parent, title, res=(800, 600), printer=None):
-        wx.Frame.__init__(self, parent=parent, title=title)
+    def __init__(self, parent, title, res = (800, 600), printer = None):
+        wx.Frame.__init__(self, parent = parent, title = title)
        self.p = printer
        self.pic = wx.StaticBitmap(self)
        self.bitmap = wx.EmptyBitmap(*res)
@@ -101,7 +101,7 @@ class dispframe(wx.Frame):
            wx.CallAfter(self.ShowFullScreen, 0)
            wx.CallAfter(self.timer.Stop)

-    def present(self, layers, interval=0.5, pause=0.2, thickness=0.4, scale=20, size=(800, 600), offset=(0, 0)):
+    def present(self, layers, interval = 0.5, pause = 0.2, thickness = 0.4, scale = 20, size = (800, 600), offset = (0, 0)):
        wx.CallAfter(self.pic.Hide)
        wx.CallAfter(self.Refresh)
        self.layers = layers
@@ -118,47 +118,47 @@ class dispframe(wx.Frame):

 class setframe(wx.Frame):

-    def __init__(self, parent, printer=None):
-        wx.Frame.__init__(self, parent, title="Projector setup")
-        self.f = dispframe(None, "", printer=printer)
+    def __init__(self, parent, printer = None):
+        wx.Frame.__init__(self, parent, title = "Projector setup")
+        self.f = dispframe(None, "", printer = printer)
        self.panel = wx.Panel(self)
        self.panel.SetBackgroundColour("orange")
-        self.bload = wx.Button(self.panel, -1, "Load", pos=(0, 0))
+        self.bload = wx.Button(self.panel, -1, "Load", pos = (0, 0))
        self.bload.Bind(wx.EVT_BUTTON, self.loadfile)

-        wx.StaticText(self.panel, -1, "Layer:", pos=(0, 30))
-        wx.StaticText(self.panel, -1, "mm", pos=(130, 30))
-        self.thickness = wx.TextCtrl(self.panel, -1, "0.5", pos=(50, 30))
+        wx.StaticText(self.panel, -1, "Layer:", pos = (0, 30))
+        wx.StaticText(self.panel, -1, "mm", pos = (130, 30))
+        self.thickness = wx.TextCtrl(self.panel, -1, "0.5", pos = (50, 30))

-        wx.StaticText(self.panel, -1, "Exposure:", pos=(0, 60))
-        wx.StaticText(self.panel, -1, "s", pos=(130, 60))
-        self.interval = wx.TextCtrl(self.panel, -1, "0.5", pos=(50, 60))
+        wx.StaticText(self.panel, -1, "Exposure:", pos = (0, 60))
+        wx.StaticText(self.panel, -1, "s", pos = (130, 60))
+        self.interval = wx.TextCtrl(self.panel, -1, "0.5", pos = (50, 60))

-        wx.StaticText(self.panel, -1, "Blank:", pos=(0, 90))
-        wx.StaticText(self.panel, -1, "s", pos=(130, 90))
-        self.delay = wx.TextCtrl(self.panel, -1, "0.5", pos=(50, 90))
+        wx.StaticText(self.panel, -1, "Blank:", pos = (0, 90))
+        wx.StaticText(self.panel, -1, "s", pos = (130, 90))
+        self.delay = wx.TextCtrl(self.panel, -1, "0.5", pos = (50, 90))

-        wx.StaticText(self.panel, -1, "Scale:", pos=(0, 120))
-        wx.StaticText(self.panel, -1, "x", pos=(130, 120))
-        self.scale = wx.TextCtrl(self.panel, -1, "5", pos=(50, 120))
+        wx.StaticText(self.panel, -1, "Scale:", pos = (0, 120))
+        wx.StaticText(self.panel, -1, "x", pos = (130, 120))
+        self.scale = wx.TextCtrl(self.panel, -1, "5", pos = (50, 120))

-        wx.StaticText(self.panel, -1, "X:", pos=(160, 30))
-        self.X = wx.TextCtrl(self.panel, -1, "1024", pos=(210, 30))
+        wx.StaticText(self.panel, -1, "X:", pos = (160, 30))
+        self.X = wx.TextCtrl(self.panel, -1, "1024", pos = (210, 30))

-        wx.StaticText(self.panel, -1, "Y:", pos=(160, 60))
-        self.Y = wx.TextCtrl(self.panel, -1, "768", pos=(210, 60))
+        wx.StaticText(self.panel, -1, "Y:", pos = (160, 60))
+        self.Y = wx.TextCtrl(self.panel, -1, "768", pos = (210, 60))

-        wx.StaticText(self.panel, -1, "OffsetX:", pos=(160, 90))
-        self.offsetX = wx.TextCtrl(self.panel, -1, "50", pos=(210, 90))
+        wx.StaticText(self.panel, -1, "OffsetX:", pos = (160, 90))
+        self.offsetX = wx.TextCtrl(self.panel, -1, "50", pos = (210, 90))

-        wx.StaticText(self.panel, -1, "OffsetY:", pos=(160, 120))
-        self.offsetY = wx.TextCtrl(self.panel, -1, "50", pos=(210, 120))
+        wx.StaticText(self.panel, -1, "OffsetY:", pos = (160, 120))
+        self.offsetY = wx.TextCtrl(self.panel, -1, "50", pos = (210, 120))

-        self.bload = wx.Button(self.panel, -1, "Present", pos=(0, 150))
+        self.bload = wx.Button(self.panel, -1, "Present", pos = (0, 150))
        self.bload.Bind(wx.EVT_BUTTON, self.startdisplay)

-        wx.StaticText(self.panel, -1, "Fullscreen:", pos=(160, 150))
-        self.fullscreen = wx.CheckBox(self.panel, -1, pos=(220, 150))
+        wx.StaticText(self.panel, -1, "Fullscreen:", pos = (160, 150))
+        self.fullscreen = wx.CheckBox(self.panel, -1, pos = (220, 150))
        self.fullscreen.SetValue(True)

        self.Show()
@@ -168,7 +168,7 @@ class setframe(wx.Frame):
            shutil.rmtree(self.image_dir)

    def parsesvg(self, name):
-        et = xml.etree.ElementTree.ElementTree(file=name)
+        et = xml.etree.ElementTree.ElementTree(file = name)
        #xml.etree.ElementTree.dump(et)
        slicer = 'Slic3r' if et.getroot().find('{http://www.w3.org/2000/svg}metadata') == None else 'Skeinforge'
        zlast = 0
@@ -214,7 +214,7 @@ class setframe(wx.Frame):
        return ol, -1, "bitmap"

    def loadfile(self, event):
-        dlg = wx.FileDialog(self, ("Open file to print"), style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
+        dlg = wx.FileDialog(self, ("Open file to print"), style = wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
        dlg.SetWildcard(("Slic3r or Skeinforge svg files (;*.svg;*.SVG;);3DLP Zip (;*.3dlp.zip;)"))
        if(dlg.ShowModal() == wx.ID_OK):
            name = dlg.GetPath()
@@ -240,12 +240,12 @@ class setframe(wx.Frame):
            self.f.ShowFullScreen(1)
        l = self.layers[0][:]
        self.f.present(l,
-            thickness=float(self.thickness.GetValue()),
-            interval=float(self.interval.GetValue()),
-            scale=float(self.scale.GetValue()),
-            pause=float(self.delay.GetValue()),
-            size=(float(self.X.GetValue()), float(self.Y.GetValue())),
-            offset=(float(self.offsetX.GetValue()), float(self.offsetY.GetValue())))
+            thickness = float(self.thickness.GetValue()),
+            interval = float(self.interval.GetValue()),
+            scale = float(self.scale.GetValue()),
+            pause = float(self.delay.GetValue()),
+            size = (float(self.X.GetValue()), float(self.Y.GetValue())),
+            offset = (float(self.offsetX.GetValue()), float(self.offsetY.GetValue())))

 if __name__ == "__main__":
    a = wx.App()

--- a/printrun/pronterface_widgets.py
+++ b/printrun/pronterface_widgets.py
--- a/printrun/stltool.py
+++ b/printrun/stltool.py
--- a/printrun/stlview.py
+++ b/printrun/stlview.py
@@ -32,8 +32,8 @@ from pyglet.gl import *
 class GLPanel(wx.Panel):
    '''A simple class for using OpenGL with wxPython.'''

-    def __init__(self, parent, id, pos=wx.DefaultPosition,
-                 size=wx.DefaultSize, style=0):
+    def __init__(self, parent, id, pos = wx.DefaultPosition,
+                 size = wx.DefaultSize, style = 0):
        # Forcing a no full repaint to stop flickering
        style = style | wx.NO_FULL_REPAINT_ON_RESIZE
        #call super function
@@ -46,7 +46,7 @@ class GLPanel(wx.Panel):
                      glcanvas.WX_GL_DEPTH_SIZE, 24)  # 24 bit
        # Create the canvas
        self.sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.canvas = glcanvas.GLCanvas(self, attribList=attribList)
+        self.canvas = glcanvas.GLCanvas(self, attribList = attribList)
        self.sizer.Add(self.canvas, 1, wx.EXPAND)
        self.SetSizer(self.sizer)
        #self.sizer.Fit(self)
@@ -215,7 +215,7 @@ class stlview(object):
                normals.extend(i[0])

        # Create a list of triangle indices.
-        indices = range(3 * len(facets))  # [[3*i,3*i+1,3*i+2] for i in xrange(len(facets))]
+        indices = range(3 * len(facets))  # [[3*i, 3*i+1, 3*i+2] for i in xrange(len(facets))]
        #print indices[:10]
        self.vertex_list = batch.add_indexed(len(vertices) // 3,
                                             GL_TRIANGLES,
@@ -233,7 +233,7 @@ def vdiff(v, o):


 class gcview(object):
-    def __init__(self, lines, batch, w=0.5, h=0.5):
+    def __init__(self, lines, batch, w = 0.5, h = 0.5):
        # Create the vertex and normal arrays.
        vertices = []
        normals = []
@@ -258,7 +258,7 @@ class gcview(object):
                if lasth is not None:
                    self.layers[lasth] = pyglet.graphics.Batch()
                    lt = layertemp[lasth][0]
-                    indices = range(len(layertemp[lasth][0]) // 3)  # [[3*i,3*i+1,3*i+2] for i in xrange(len(facets))]
+                    indices = range(len(layertemp[lasth][0]) // 3)  # [[3*i, 3*i+1, 3*i+2] for i in xrange(len(facets))]
                    self.vlists.append(self.layers[lasth].add_indexed(len(layertemp[lasth][0]) // 3,
                                             GL_TRIANGLES,
                                             None,  # group,
@@ -296,7 +296,7 @@ class gcview(object):
        t0 = time.time()

        # Create a list of triangle indices.
-        indices = range(3 * 16 * len(lines))  # [[3*i,3*i+1,3*i+2] for i in xrange(len(facets))]
+        indices = range(3 * 16 * len(lines))  # [[3*i, 3*i+1, 3*i+2] for i in xrange(len(facets))]
        self.vlists.append(batch.add_indexed(len(vertices) // 3,
                                             GL_TRIANGLES,
                                             None,  # group,
@@ -305,7 +305,7 @@ class gcview(object):
                                             ('n3f/static', normals)))
        if lasth is not None:
            self.layers[lasth] = pyglet.graphics.Batch()
-                    indices = range(len(layertemp[lasth][0]))  # [[3*i,3*i+1,3*i+2] for i in xrange(len(facets))]
+            indices = range(len(layertemp[lasth][0]))  # [[3*i, 3*i+1, 3*i+2] for i in xrange(len(facets))]
            self.vlists.append(self.layers[lasth].add_indexed(len(layertemp[lasth][0]) // 3,
                                     GL_TRIANGLES,
                                     None,  # group,
@@ -466,7 +466,7 @@ def mulquat(q1, rq):

 class TestGlPanel(GLPanel):

-    def __init__(self, parent, size, id=wx.ID_ANY):
+    def __init__(self, parent, size, id = wx.ID_ANY):
        super(TestGlPanel, self).__init__(parent, id, wx.DefaultPosition, size, 0)
        self.batches = []
        self.rot = 0
@@ -495,7 +495,7 @@ class TestGlPanel(GLPanel):
    def forceresize(self):
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] + 1))
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] - 1))
-        threading.Thread(target=self.update).start()
+        threading.Thread(target = self.update).start()
        self.initialized = 0

    def move_shape(self, delta):
@@ -547,7 +547,7 @@ class TestGlPanel(GLPanel):
                p1y = -(float(p1[1]) - sz[1] / 2) / (sz[1] / 2)
                p2x = (float(p2[0]) - sz[0] / 2) / (sz[0] / 2)
                p2y = -(float(p2[1]) - sz[1] / 2) / (sz[1] / 2)
-                #print p1x,p1y,p2x,p2y
+                #print p1x, p1y, p2x, p2y
                quat = trackball(p1x, p1y, p2x, p2y, -self.transv[2] / 250.0)
                if self.rot:
                    self.basequat = mulquat(self.basequat, quat)
@@ -710,7 +710,7 @@ class TestGlPanel(GLPanel):

    def drawmodel(self, m, n):
        batch = pyglet.graphics.Batch()
-        stl = stlview(m.facets, batch=batch)
+        stl = stlview(m.facets, batch = batch)
        m.batch = batch
        m.animoffset = 300
        #print m
@@ -819,8 +819,8 @@ class TestGlPanel(GLPanel):
 class GCFrame(wx.Frame):
    '''A simple class for using OpenGL with wxPython.'''

-    def __init__(self, parent, ID, title, pos=wx.DefaultPosition,
-            size=wx.DefaultSize, style=wx.DEFAULT_FRAME_STYLE):
+    def __init__(self, parent, ID, title, pos = wx.DefaultPosition,
+            size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE):
        super(GCFrame, self).__init__(parent, ID, title, pos, (size[0] + 150, size[1]), style)

        class d:
@@ -833,21 +833,21 @@ class GCFrame(wx.Frame):
        m.curlayer = 0.0
        m.scale = [1.0, 1.0, 1.0]
        m.batch = pyglet.graphics.Batch()
-        m.gc = gcview([], batch=m.batch)
+        m.gc = gcview([], batch = m.batch)
        self.models = {"": m}
        self.l = d()
        self.modelindex = 0
        self.GLPanel1 = TestGlPanel(self, size)

-    def addfile(self, gcode=[]):
+    def addfile(self, gcode = []):
        self.models[""].gc.delete()
-        self.models[""].gc = gcview(gcode, batch=self.models[""].batch)
+        self.models[""].gc = gcview(gcode, batch = self.models[""].batch)

    def clear(self):
        self.models[""].gc.delete()
-        self.models[""].gc = gcview([], batch=self.models[""].batch)
+        self.models[""].gc = gcview([], batch = self.models[""].batch)

-    def Show(self, arg=True):
+    def Show(self, arg = True):
        wx.Frame.Show(self, arg)
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] + 1))
        self.SetClientSize((self.GetClientSize()[0], self.GetClientSize()[1] - 1))
@@ -868,10 +868,10 @@ class GCFrame(wx.Frame):


 def main():
-    app = wx.App(redirect=False)
-    frame = GCFrame(None, wx.ID_ANY, 'Gcode view, shift to move view, mousewheel to set layer', size=(400, 400))
+    app = wx.App(redirect = False)
+    frame = GCFrame(None, wx.ID_ANY, 'Gcode view, shift to move view, mousewheel to set layer', size = (400, 400))
    frame.addfile(list(open("carriage dump_export.gcode")))
-    #frame = wx.Frame(None, -1, "GL Window", size=(400, 400))
+    #frame = wx.Frame(None, -1, "GL Window", size = (400, 400))
    #panel = TestGlPanel(frame)
    #frame.Show(True)
    #app.MainLoop()

--- a/printrun/svg/__init__.py
+++ b/printrun/svg/__init__.py
@@ -4,8 +4,8 @@

 import wx

-def AddEllipticalArc(self, x, y, w, h, startAngle, endAngle, clockwise=False):
-    """ Draws an arc of an ellipse within bounding rect (x,y,w,h) 
+def AddEllipticalArc(self, x, y, w, h, startAngle, endAngle, clockwise = False):
+    """ Draws an arc of an ellipse within bounding rect (x, y, w, h)
    from startArc to endArc (in radians, relative to the horizontal line of the eclipse)"""

    if True:
@@ -40,4 +40,3 @@ if not hasattr(wx.GraphicsPath, "AddEllipticalArc"):
    wx.GraphicsPath.AddEllipticalArc = AddEllipticalArc

 del AddEllipticalArc
-    
\ No newline at end of file
--- a/printrun/svg/attributes.py
+++ b/printrun/svg/attributes.py
@@ -22,7 +22,7 @@ colorDeclaration = none | currentColor | colourValue

 urlEnd = (
    Literal(")").suppress() +
-    Optional(Group(colorDeclaration), default=()) + 
+    Optional(Group(colorDeclaration), default = ()) +
    StringEnd()
 )

@@ -30,12 +30,12 @@ url = (
    CaselessLiteral("URL")
    +
    Literal("(").suppress()+
-    Group(SkipTo(urlEnd, include=True).setParseAction(parsePossibleURL))
+    Group(SkipTo(urlEnd, include = True).setParseAction(parsePossibleURL))
 )

 #paint value will parse into a (type, details) tuple.
 #For none and currentColor, the details tuple will be the empty tuple
-#for CSS color declarations, it will be (type, (R,G,B))
+#for CSS color declarations, it will be (type, (R, G, B))
 #for URLs, it will be ("URL", ((url tuple), fallback))
 #The url tuple will be as returned by urlparse.urlsplit, and can be
 #an empty tuple if the parser has an error

--- a/printrun/svg/css/atrule.py
+++ b/printrun/svg/css/atrule.py
--- a/printrun/svg/css/block.py
+++ b/printrun/svg/css/block.py
@@ -5,4 +5,3 @@
 from pyparsing import nestedExpr

 block = nestedExpr(opener="{", closer="}")
-
--- a/printrun/svg/css/colour.py
+++ b/printrun/svg/css/colour.py
--- a/printrun/svg/css/identifier.py
+++ b/printrun/svg/css/identifier.py
--- a/printrun/svg/css/inline.py
+++ b/printrun/svg/css/inline.py
--- a/printrun/svg/css/transform.py
+++ b/printrun/svg/css/transform.py
--- a/printrun/svg/css/values.py
+++ b/printrun/svg/css/values.py
--- a/printrun/svg/document.py
+++ b/printrun/svg/document.py
@@ -14,22 +14,22 @@ from svg.css.colour import colourValue
 from svg.css import values
 from attributes import paintValue

-document = """<?xml version="1.0" standalone="no"?>
+document = """<?xml version = "1.0" standalone = "no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="4cm" height="4cm" viewBox="0 0 400 400"
-     xmlns="http://www.w3.org/2000/svg" version="1.1">
+<svg width = "4cm" height = "4cm" viewBox = "0 0 400 400"
+     xmlns = "http://www.w3.org/2000/svg" version = "1.1">
  <title>Example triangle01- simple example of a 'path'</title>
  <desc>A path that draws a triangle</desc>
-  <rect x="1" y="1" width="398" height="398"
-        fill="none" stroke="blue" />
-  <path d="M 100 100 L 300 100 L 200 300 z"
-        fill="red" stroke="blue" stroke-width="3" />
+  <rect x = "1" y = "1" width = "398" height = "398"
+        fill = "none" stroke = "blue" />
+  <path d = "M 100 100 L 300 100 L 200 300 z"
+        fill = "red" stroke = "blue" stroke-width = "3" />
 </svg>"""

 makePath = lambda: wx.GraphicsRenderer_GetDefaultRenderer().CreatePath()

-def attrAsFloat(node, attr, defaultValue="0"):
+def attrAsFloat(node, attr, defaultValue = "0"):
    val = node.get(attr, defaultValue)
    #TODO: process stuff like "inherit" by walking back up the nodes
    #fast path optimization - if it's a valid float, don't
@@ -39,7 +39,7 @@ def attrAsFloat(node, attr, defaultValue="0"):
    except ValueError:
        return valueToPixels(val)

-def valueToPixels(val, defaultUnits="px"):
+def valueToPixels(val, defaultUnits = "px"):
    #TODO manage default units
    from pyparsing import ParseException
    try:
@@ -175,14 +175,14 @@ class SVGDocument(object):
                    )
                if transform == 'skewX':
                    matrix = wx.GraphicsRenderer_GetDefaultRenderer().CreateMatrix(
-                        1,0,math.tan(math.radians(args[0])),1,0,0
+                        1, 0, math.tan(math.radians(args[0])), 1, 0, 0
                    )
                    ops.append(
                        (wx.GraphicsContext.ConcatTransform, (matrix,))
                    )
                if transform == 'skewY':
                    matrix = wx.GraphicsRenderer_GetDefaultRenderer().CreateMatrix(
-                        1,math.tan(math.radians(args[0])),0,1,0,0
+                        1, math.tan(math.radians(args[0])), 0, 1, 0, 0
                    )
                    ops.append(
                        (wx.GraphicsContext.ConcatTransform, (matrix,))
@@ -231,7 +231,7 @@ class SVGDocument(object):
    def addTextToDocument(self, node):
        x, y = [attrAsFloat(node, attr) for attr in ('x', 'y')]

-        def DoDrawText(context, text, x, y, brush=wx.NullGraphicsBrush):
+        def DoDrawText(context, text, x, y, brush = wx.NullGraphicsBrush):
            #SVG spec appears to originate text from the bottom
            #rather than the top as with our API. This function
            #will measure and then re-orient the text as needed.
@@ -259,7 +259,7 @@ class SVGDocument(object):
        rx = node.get('rx')
        ry = node.get('ry')
        if not (w and h):
-            path.MoveToPoint(x,y) #keep the current point correct
+            path.MoveToPoint(x, y) #keep the current point correct
            return
        if rx or ry:
            if rx and ry:
@@ -449,7 +449,7 @@ class SVGDocument(object):
        pen.SetJoin(joinmap.get(self.state.get('stroke-linejoin', None), wx.JOIN_MITER))
        return wx.GraphicsRenderer_GetDefaultRenderer().CreatePen(pen)

-    def getBrushFromState(self, path=None):
+    def getBrushFromState(self, path = None):
        brushcolour = self.state.get('fill', 'black').strip()
        type, details = paintValue.parseString(brushcolour)
        if type == "URL":
@@ -465,29 +465,29 @@ class SVGDocument(object):
                    box = path.GetBox()
                    x, y, w, h = box.Get()
                    return wx.GraphicsRenderer.GetDefaultRenderer().CreateLinearGradientBrush(
-                        x,y,x+w,y+h,wx.Colour(0,0,255,128), wx.RED
+                        x, y, x+w, y+h, wx.Colour(0, 0, 255, 128), wx.RED
                    )
                elif element.tag == '{http://www.w3.org/2000/svg}radialGradient':
                    box = path.GetBox()
                    x, y, w, h = box.Get()
                    #print w
-                    mx = wx.GraphicsRenderer.GetDefaultRenderer().CreateMatrix(x,y,w,h)
+                    mx = wx.GraphicsRenderer.GetDefaultRenderer().CreateMatrix(x, y, w, h)
                    cx, cy = mx.TransformPoint(0.5, 0.5)
                    fx, fy = cx, cy
                    return wx.GraphicsRenderer.GetDefaultRenderer().CreateRadialGradientBrush(
-                        cx,cy,
-                        fx,fy,
-                        (max(w,h))/2,
-                        wx.Colour(0,0,255,128), wx.RED
+                        cx, cy,
+                        fx, fy,
+                        (max(w, h))/2,
+                        wx.Colour(0, 0, 255, 128), wx.RED
                    )
                else:
                    #invlid gradient specified
                    return wx.NullBrush
-            r,g,b  = 0,0,0
+            r, g, b  = 0, 0, 0
        if type == 'CURRENTCOLOR':
            type, details = paintValue.parseString(self.state.get('color', 'none'))
        if type == 'RGB':
-            r,g,b = details
+            r, g, b = details
        elif type == "NONE":
            return wx.NullBrush
        opacity = self.state.get('fill-opacity', self.state.get('opacity', '1'))
@@ -499,9 +499,9 @@ class SVGDocument(object):
        #be created every time anyway in order to pass them,
        #defeating the purpose of the cache
        try:
-            return SVGDocument.brushCache[(r,g,b,a)]
+            return SVGDocument.brushCache[(r, g, b, a)]
        except KeyError:
-            return SVGDocument.brushCache.setdefault((r,g,b,a), wx.Brush(wx.Colour(r,g,b,a)))
+            return SVGDocument.brushCache.setdefault((r, g, b, a), wx.Brush(wx.Colour(r, g, b, a)))


    def resolveURL(self, urlData):
@@ -571,7 +571,7 @@ class SVGDocument(object):
            #~ cp = path.GetCurrentPoint()
            #~ path.AddCircle(c1x, c1y, 5)
            #~ path.AddCircle(c2x, c2y, 3)
-            #~ path.AddCircle(x,y, 7)
+            #~ path.AddCircle(x, y, 7)
            #~ path.MoveToPoint(cp)
            #~ print "C", control1, control2, endpoint

@@ -584,7 +584,7 @@ class SVGDocument(object):
                control1 = reflectPoint(self.lastControl, path.GetCurrentPoint())
            else:
                control1 = path.GetCurrentPoint()
-            #~ print "S", self.lastControl,":",control1, control2, endpoint    
+            #~ print "S", self.lastControl, ":", control1, control2, endpoint
            self.lastControl = control2
            path.AddCurveToPoint(
                control1,
@@ -592,7 +592,7 @@ class SVGDocument(object):
                endpoint
            )
        elif type == "Q":
-            (cx, cy), (x,y) = map(normalizePoint, arg)
+            (cx, cy), (x, y) = map(normalizePoint, arg)
            self.lastControlQ = (cx, cy)
            path.AddQuadCurveToPoint(cx, cy, x, y)
        elif type == "T":
@@ -607,12 +607,12 @@ class SVGDocument(object):
        elif type == "V":
            _, y = normalizePoint((0, arg))
            x, _ = path.GetCurrentPoint()
-            path.AddLineToPoint(x,y)
+            path.AddLineToPoint(x, y)

        elif type == "H":
            x, _ = normalizePoint((arg, 0))
            _, y = path.GetCurrentPoint()
-            path.AddLineToPoint(x,y)
+            path.AddLineToPoint(x, y)

        elif type == "A":
            #wxGC currently only supports circular arcs,
@@ -625,14 +625,14 @@ class SVGDocument(object):
            (x, y) #endpoint on the arc
            ) = arg

-            x, y = normalizePoint((x,y))
+            x, y = normalizePoint((x, y))
            cx, cy = path.GetCurrentPoint()
            if (cx, cy) == (x, y):
                return #noop

            if (rx == 0 or ry == 0):
                #no radius is effectively a line
-                path.AddLineToPoint(x,y)
+                path.AddLineToPoint(x, y)
                return

            #find the center point for the ellipse
@@ -685,7 +685,7 @@ class SVGDocument(object):
            path.MoveToPoint(x, y)
            #~ npath = makePath()
            #~ npath.AddEllipticalArc(cnx-rx, cny-ry, rx*2, ry*2, firstArc, lastArc, False)
-            #~ npath.MoveToPoint(x,y)
+            #~ npath.MoveToPoint(x, y)
            #~ path.AddPath(npath)

        elif type == 'Z':

--- a/printrun/svg/pathdata.py
+++ b/printrun/svg/pathdata.py
@@ -27,12 +27,12 @@ class CaselessPreservingLiteral(CaselessLiteral):
        instead of as defined.
    """
    def __init__( self, matchString ):
-        super(CaselessPreservingLiteral,self).__init__( matchString.upper() )
+        super(CaselessPreservingLiteral, self).__init__( matchString.upper() )
        self.name = "'%s'" % matchString
        self.errmsg = "Expected " + self.name
        self.myException.msg = self.errmsg

-    def parseImpl( self, instring, loc, doActions=True ):
+    def parseImpl( self, instring, loc, doActions = True ):
        test = instring[ loc:loc+self.matchLen ]
        if test.upper() == self.match:
            return loc+self.matchLen, test
@@ -117,7 +117,7 @@ ellipticalArcArgument = Group(
    arcRadius + maybeComma + #rx, ry
    number + maybeComma +#rotation
    arcFlags + #large-arc-flag, sweep-flag
-    coordinatePair #(x,y)
+    coordinatePair #(x, y)
 )


@@ -189,5 +189,3 @@ if __name__ == '__main__':
    #~ from tests.test_pathdata import *
    #~ unittest.main()
    profile()
-
-
--- a/printrun/webinterface.py
+++ b/printrun/webinterface.py
--- a/printrun/xybuttons.py
+++ b/printrun/xybuttons.py
@@ -41,9 +41,9 @@ class XYButtons(BufferedCanvas):
    center = (124, 121)
    spacer = 7

-    def __init__(self, parent, moveCallback=None, cornerCallback=None, spacebarCallback=None, bgcolor="#FFFFFF", ID=-1):
-        self.bg_bmp = wx.Image(imagefile("control_xy.png"),wx.BITMAP_TYPE_PNG).ConvertToBitmap()
-        self.keypad_bmp = wx.Image(imagefile("arrow_keys.png"),wx.BITMAP_TYPE_PNG).ConvertToBitmap()
+    def __init__(self, parent, moveCallback = None, cornerCallback = None, spacebarCallback = None, bgcolor = "#FFFFFF", ID=-1):
+        self.bg_bmp = wx.Image(imagefile("control_xy.png"), wx.BITMAP_TYPE_PNG).ConvertToBitmap()
+        self.keypad_bmp = wx.Image(imagefile("arrow_keys.png"), wx.BITMAP_TYPE_PNG).ConvertToBitmap()
        self.keypad_idx = -1
        self.quadrant = None
        self.concentric = None
@@ -181,7 +181,7 @@ class XYButtons(BufferedCanvas):

        self.drawPartialPie(gc, center, r1-inner_ring_radius, r2-inner_ring_radius, a1+fudge, a2-fudge)

-    def drawCorner(self, gc, x, y, angle=0.0):
+    def drawCorner(self, gc, x, y, angle = 0.0):
        w, h = XYButtons.corner_size

        gc.PushState()
@@ -197,7 +197,7 @@ class XYButtons(BufferedCanvas):
        gc.DrawPath(path)
        gc.PopState()

-    def highlightCorner(self, gc, corner=0):
+    def highlightCorner(self, gc, corner = 0):
        w, h = XYButtons.corner_size
        cx, cy = XYButtons.center
        ww, wh = self.GetSizeTuple()
@@ -229,8 +229,8 @@ class XYButtons(BufferedCanvas):

        if self.enabled:
            # Brush and pen for grey overlay when mouse hovers over
-            gc.SetPen(wx.Pen(wx.Colour(100,100,100,172), 4))
-            gc.SetBrush(wx.Brush(wx.Colour(0,0,0,128)))
+            gc.SetPen(wx.Pen(wx.Colour(100, 100, 100, 172), 4))
+            gc.SetBrush(wx.Brush(wx.Colour(0, 0, 0, 128)))

            if self.concentric != None:
                if self.concentric < len(XYButtons.concentric_circle_radii):
@@ -246,8 +246,8 @@ class XYButtons(BufferedCanvas):
                gc.DrawBitmap(self.keypad_bmp, pos[0], pos[1], padw, padh)

            # Draw label overlays
-            gc.SetPen(wx.Pen(wx.Colour(255,255,255,128), 1))
-            gc.SetBrush(wx.Brush(wx.Colour(255,255,255,128+64)))
+            gc.SetPen(wx.Pen(wx.Colour(255, 255, 255, 128), 1))
+            gc.SetBrush(wx.Brush(wx.Colour(255, 255, 255, 128+64)))
            for idx, kpos in XYButtons.label_overlay_positions.items():
                if idx != self.concentric:
                    r = kpos[2]

--- a/printrun/zbuttons.py
+++ b/printrun/zbuttons.py
@@ -32,8 +32,8 @@ class ZButtons(BufferedCanvas):
        3: None
    }

-    def __init__(self, parent, moveCallback=None, bgcolor="#FFFFFF", ID=-1):
-        self.bg_bmp = wx.Image(imagefile("control_z.png"),wx.BITMAP_TYPE_PNG).ConvertToBitmap()
+    def __init__(self, parent, moveCallback = None, bgcolor = "#FFFFFF", ID=-1):
+        self.bg_bmp = wx.Image(imagefile("control_z.png"), wx.BITMAP_TYPE_PNG).ConvertToBitmap()
        self.range = None
        self.direction = None
        self.orderOfMagnitudeIdx = 0 # 0 means '1', 1 means '10', 2 means '100', etc.
@@ -108,16 +108,16 @@ class ZButtons(BufferedCanvas):

        if self.enabled:
            # Draw label overlays
-            gc.SetPen(wx.Pen(wx.Colour(255,255,255,128), 1))
-            gc.SetBrush(wx.Brush(wx.Colour(255,255,255,128+64)))
+            gc.SetPen(wx.Pen(wx.Colour(255, 255, 255, 128), 1))
+            gc.SetBrush(wx.Brush(wx.Colour(255, 255, 255, 128+64)))
            for idx, kpos in ZButtons.label_overlay_positions.items():
                if kpos and idx != self.range:
                    r = kpos[2]
                    gc.DrawEllipse(ZButtons.center[0]-kpos[0]-r, ZButtons.center[1]-kpos[1]-r, r*2, r*2)

            # Top 'layer' is the mouse-over highlights
-            gc.SetPen(wx.Pen(wx.Colour(100,100,100,172), 4))
-            gc.SetBrush(wx.Brush(wx.Colour(0,0,0,128)))
+            gc.SetPen(wx.Pen(wx.Colour(100, 100, 100, 172), 4))
+            gc.SetBrush(wx.Brush(wx.Colour(0, 0, 0, 128)))
            if self.range != None and self.direction != None:
                self.highlight(gc, self.range, self.direction)
        else:

--- a/printrun/zscaper.py
+++ b/printrun/zscaper.py
@@ -13,63 +13,63 @@
 # You should have received a copy of the GNU General Public License
 # along with Printrun.  If not, see <http://www.gnu.org/licenses/>.

-import wx,math
+import wx, math
 from stltool import *
-a=wx.App()
+a = wx.App()

-def genscape(data=[[0,1,0,0],[1,0,2,0],[1,0,0,0],[0,1,0,1]],pscale=1.0,bheight=1.0,zscale=1.0):
-    o=stl(None)
-    datal=len(data)
-    datah=len(data[0])
+def genscape(data = [[0, 1, 0, 0],[1, 0, 2, 0],[1, 0, 0, 0],[0, 1, 0, 1]], pscale = 1.0, bheight = 1.0, zscale = 1.0):
+    o = stl(None)
+    datal = len(data)
+    datah = len(data[0])
    #create bottom:
-    bmidpoint=(pscale*(datal-1)/2.0,pscale*(datah-1)/2.0)
-    #print range(datal),bmidpoint
-    for i in zip(range(datal+1)[:-1],range(datal+1)[1:])[:-1]:
-        #print (pscale*i[0],pscale*i[1])
-        o.facets+=[[[0,0,-1],[[0.0,pscale*i[0],0.0],[0.0,pscale*i[1],0.0],[bmidpoint[0],bmidpoint[1],0.0]]]]
-        o.facets+=[[[0,0,-1],[[2.0*bmidpoint[1],pscale*i[1],0.0],[2.0*bmidpoint[1],pscale*i[0],0.0],[bmidpoint[0],bmidpoint[1],0.0]]]]
-        o.facets+=[genfacet([[0.0,pscale*i[0],data[i[0]][0]*zscale+bheight],[0.0,pscale*i[1],data[i[1]][0]*zscale+bheight],[0.0,pscale*i[1],0.0]])]
-        o.facets+=[genfacet([[2.0*bmidpoint[1],pscale*i[1],data[i[1]][datah-1]*zscale+bheight],[2.0*bmidpoint[1],pscale*i[0],data[i[0]][datah-1]*zscale+bheight],[2.0*bmidpoint[1],pscale*i[1],0.0]])]
-        o.facets+=[genfacet([[0.0,pscale*i[0],data[i[0]][0]*zscale+bheight],[0.0,pscale*i[1],0.0],[0.0,pscale*i[0],0.0]])]
-        o.facets+=[genfacet([[2.0*bmidpoint[1],pscale*i[1],0.0],[2.0*bmidpoint[1],pscale*i[0],data[i[0]][datah-1]*zscale+bheight],[2.0*bmidpoint[1],pscale*i[0],0.0]])]
+    bmidpoint = (pscale*(datal-1)/2.0, pscale*(datah-1)/2.0)
+    #print range(datal), bmidpoint
+    for i in zip(range(datal+1)[:-1], range(datal+1)[1:])[:-1]:
+        #print (pscale*i[0], pscale*i[1])
+        o.facets+=[[[0, 0,-1],[[0.0, pscale*i[0], 0.0],[0.0, pscale*i[1], 0.0],[bmidpoint[0], bmidpoint[1], 0.0]]]]
+        o.facets+=[[[0, 0,-1],[[2.0*bmidpoint[1], pscale*i[1], 0.0],[2.0*bmidpoint[1], pscale*i[0], 0.0],[bmidpoint[0], bmidpoint[1], 0.0]]]]
+        o.facets+=[genfacet([[0.0, pscale*i[0], data[i[0]][0]*zscale+bheight],[0.0, pscale*i[1], data[i[1]][0]*zscale+bheight],[0.0, pscale*i[1], 0.0]])]
+        o.facets+=[genfacet([[2.0*bmidpoint[1], pscale*i[1], data[i[1]][datah-1]*zscale+bheight],[2.0*bmidpoint[1], pscale*i[0], data[i[0]][datah-1]*zscale+bheight],[2.0*bmidpoint[1], pscale*i[1], 0.0]])]
+        o.facets+=[genfacet([[0.0, pscale*i[0], data[i[0]][0]*zscale+bheight],[0.0, pscale*i[1], 0.0],[0.0, pscale*i[0], 0.0]])]
+        o.facets+=[genfacet([[2.0*bmidpoint[1], pscale*i[1], 0.0],[2.0*bmidpoint[1], pscale*i[0], data[i[0]][datah-1]*zscale+bheight],[2.0*bmidpoint[1], pscale*i[0], 0.0]])]
        #print o.facets[-1]
        pass
        #print o.facets[-4:]
-    for i in zip(range(datah+1)[:-1],range(datah+1)[1:])[:-1]:
-        #print (pscale*i[0],pscale*i[1])
-        o.facets+=[[[0,0,-1],[[pscale*i[1],0.0,0.0],[pscale*i[0],0.0,0.0],[bmidpoint[0],bmidpoint[1],0.0]]]]
-        o.facets+=[[[0,0,-1],[[pscale*i[0],2.0*bmidpoint[0],0.0],[pscale*i[1],2.0*bmidpoint[0],0.0],[bmidpoint[0],bmidpoint[1],0.0]]]]
-        o.facets+=[genfacet([[pscale*i[1],0.0,data[0][i[1]]*zscale+bheight],[pscale*i[0],0.0,data[0][i[0]]*zscale+bheight],[pscale*i[1],0.0,0.0]])]
+    for i in zip(range(datah+1)[:-1], range(datah+1)[1:])[:-1]:
+        #print (pscale*i[0], pscale*i[1])
+        o.facets+=[[[0, 0,-1],[[pscale*i[1], 0.0, 0.0],[pscale*i[0], 0.0, 0.0],[bmidpoint[0], bmidpoint[1], 0.0]]]]
+        o.facets+=[[[0, 0,-1],[[pscale*i[0], 2.0*bmidpoint[0], 0.0],[pscale*i[1], 2.0*bmidpoint[0], 0.0],[bmidpoint[0], bmidpoint[1], 0.0]]]]
+        o.facets+=[genfacet([[pscale*i[1], 0.0, data[0][i[1]]*zscale+bheight],[pscale*i[0], 0.0, data[0][i[0]]*zscale+bheight],[pscale*i[1], 0.0, 0.0]])]
        #break
-        o.facets+=[genfacet([[pscale*i[0],2.0*bmidpoint[0],data[datal-1][i[0]]*zscale+bheight],[pscale*i[1],2.0*bmidpoint[0],data[datal-1][i[1]]*zscale+bheight],[pscale*i[1],2.0*bmidpoint[0],0.0]])]
-        o.facets+=[genfacet([[pscale*i[1],0.0,0.0],[pscale*i[0],0.0,data[0][i[0]]*zscale+bheight],[pscale*i[0],0.0,0.0]])]
-        o.facets+=[genfacet([[pscale*i[0],2.0*bmidpoint[0],data[datal-1][i[0]]*zscale+bheight],[pscale*i[1],2.0*bmidpoint[0],0.0],[pscale*i[0],2.0*bmidpoint[0],0.0]])]
+        o.facets+=[genfacet([[pscale*i[0], 2.0*bmidpoint[0], data[datal-1][i[0]]*zscale+bheight],[pscale*i[1], 2.0*bmidpoint[0], data[datal-1][i[1]]*zscale+bheight],[pscale*i[1], 2.0*bmidpoint[0], 0.0]])]
+        o.facets+=[genfacet([[pscale*i[1], 0.0, 0.0],[pscale*i[0], 0.0, data[0][i[0]]*zscale+bheight],[pscale*i[0], 0.0, 0.0]])]
+        o.facets+=[genfacet([[pscale*i[0], 2.0*bmidpoint[0], data[datal-1][i[0]]*zscale+bheight],[pscale*i[1], 2.0*bmidpoint[0], 0.0],[pscale*i[0], 2.0*bmidpoint[0], 0.0]])]
        pass
    for i in xrange(datah-1):
        for j in xrange(datal-1):
-            o.facets+=[genfacet([[pscale*i,pscale*j,data[j][i]*zscale+bheight],[pscale*(i+1),pscale*(j),data[j][i+1]*zscale+bheight],[pscale*(i+1),pscale*(j+1),data[j+1][i+1]*zscale+bheight]])]
-            o.facets+=[genfacet([[pscale*(i),pscale*(j+1),data[j+1][i]*zscale+bheight],[pscale*i,pscale*j,data[j][i]*zscale+bheight],[pscale*(i+1),pscale*(j+1),data[j+1][i+1]*zscale+bheight]])]
+            o.facets+=[genfacet([[pscale*i, pscale*j, data[j][i]*zscale+bheight],[pscale*(i+1), pscale*(j), data[j][i+1]*zscale+bheight],[pscale*(i+1), pscale*(j+1), data[j+1][i+1]*zscale+bheight]])]
+            o.facets+=[genfacet([[pscale*(i), pscale*(j+1), data[j+1][i]*zscale+bheight],[pscale*i, pscale*j, data[j][i]*zscale+bheight],[pscale*(i+1), pscale*(j+1), data[j+1][i+1]*zscale+bheight]])]
            #print o.facets[-1]
-    facet=[[0,0,0],[[0,0,0],[0,0,0],[0,0,0]]]
+    facet = [[0, 0, 0],[[0, 0, 0],[0, 0, 0],[0, 0, 0]]]
    return o
-def zimage(name,out):
-    i=wx.Image(name)
-    s=i.GetSize()
-    print len(map(ord,i.GetData()[::3]))
-    b=map(ord,i.GetData()[::3])
-    data=[]
+def zimage(name, out):
+    i = wx.Image(name)
+    s = i.GetSize()
+    print len(map(ord, i.GetData()[::3]))
+    b = map(ord, i.GetData()[::3])
+    data = []
    for i in xrange(s[0]):
        data+=[b[i*s[1]:(i+1)*s[1]]]
-    #data=[i[::5] for i in data[::5]]
-    emitstl(out,genscape(data,zscale=0.1).facets,name)
+    #data = [i[::5] for i in data[::5]]
+    emitstl(out, genscape(data, zscale = 0.1).facets, name)

 """
 class scapewin(wx.Frame):
-    def __init__(self,size=(400,530)):
-        wx.Frame.__init__(self,None,title="Right-click to load an image",size=size)
-        self.SetIcon(wx.Icon("plater.ico",wx.BITMAP_TYPE_ICO))
+    def __init__(self, size = (400, 530)):
+        wx.Frame.__init__(self, None, title = "Right-click to load an image", size = size)
+        self.SetIcon(wx.Icon("plater.ico", wx.BITMAP_TYPE_ICO))
        self.SetClientSize(size)
-        self.panel=wx.Panel(self,size=size)
+        self.panel = wx.Panel(self, size = size)


 """
@@ -80,6 +80,5 @@ if __name__ == '__main__':
    main.Show()
    app.MainLoop()
 """
-    zimage("catposthtmap2.jpg","testobj.stl")
+    zimage("catposthtmap2.jpg", "testobj.stl")
 del a
-
--- a/pronsole.py
+++ b/pronsole.py
--- a/pronterface.py
+++ b/pronterface.py
--- a/setup.py
+++ b/setup.py