Open GCode files with rU flag to handle weird newline combinations

printrun/gcoder.py

@@ -497,7 +497,7 @@ def main():
         return
 
     print "Line object size:", sys.getsizeof(Line("G0 X0"))
-    gcode = GCode(open(sys.argv[1]))
+    gcode = GCode(open(sys.argv[1], "rU"))
 
     print "Dimensions:"
     xdims = (gcode.xmin, gcode.xmax, gcode.width)

printrun/gviz.py

@@ -524,6 +524,6 @@ class Gviz(wx.Panel):
 if __name__ == '__main__':
     import sys
     app = wx.App(False)
-    main = GvizWindow(open(sys.argv[1]))
+    main = GvizWindow(open(sys.argv[1], "rU"))
     main.Show()
     app.MainLoop()

printrun/pronsole.py

@@ -820,7 +820,7 @@ class pronsole(cmd.Cmd):
         if not os.path.exists(filename):
             self.logError("File not found!")
             return
-        self.fgcode = gcoder.GCode(open(filename))
+        self.fgcode = gcoder.GCode(open(filename, "rU"))
         self.filename = filename
         self.log("Loaded %s, %d lines." % (filename, len(self.fgcode)))
 

printrun/pronterface.py

@@ -1614,7 +1614,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
         fn = self.filename
         try:
             self.filename = self.model_to_gcode_filename(self.filename)
-            self.fgcode = gcoder.GCode(open(self.filename))
+            self.fgcode = gcoder.GCode(open(self.filename, "rU"))
             if self.p.online:
                 wx.CallAfter(self.printbtn.Enable)
 
@@ -1684,7 +1684,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
                 self.skein(name)
             else:
                 self.filename = name
-                self.fgcode = gcoder.GCode(open(self.filename))
+                self.fgcode = gcoder.GCode(open(self.filename, "rU"))
                 self.statusbar.SetStatusText(_("Loaded %s, %d lines") % (name, len(self.fgcode)))
                 print _("Loaded %s, %d lines") % (name, len(self.fgcode))
                 wx.CallAfter(self.printbtn.SetLabel, _("Print"))