Merge branch 'master' of github.com:kliment/Printrun

prontserve.py

@@ -100,7 +100,7 @@ class JobsHandler(tornado.web.RequestHandler):
   def post(self):
     self.read_bytes = 0
     self.total_bytes = self.request.content_length
-    self.body = ''
+    self.chunks = []
     print self.request
     session_uuid = self.get_argument("session_uuid", None)
     print "me"
@@ -115,7 +115,7 @@ class JobsHandler(tornado.web.RequestHandler):
 
   def read_chunks(self, chunk=''):
     self.read_bytes += len(chunk)
-    self.body += chunk
+    self.chunks.append(chunk)
     if chunk: self.process_chunk()
 
     chunk_length = min(100000, self.request.content_length - self.read_bytes)
@@ -123,7 +123,7 @@ class JobsHandler(tornado.web.RequestHandler):
       self.request.connection.stream.read_bytes(
               chunk_length, self.read_chunks)
     else:
-      self.request._on_request_body(self.body, self.uploaded)
+      self.request._on_request_body(''.join(self.chunks), self.uploaded)
 
   def process_chunk(self):
     print self.get_argument("session_uuid", None)

setup.py

@@ -24,8 +24,10 @@ from distutils.command.install_data import install_data as _install_data
 try:
     from Cython.Build import cythonize
     extensions = cythonize("printrun/gcoder_line.pyx")
+    from Cython.Distutils import build_ext
 except ImportError:
     extensions = None
+    build_ext = None
 
 INSTALLED_FILES = "installed_files"
 
@@ -142,6 +144,12 @@ for extra_data_dir in extra_data_dirs:
         destpath = os.path.join("share", "pronterface", basedir)
         data_files.append ((destpath, files))
 
+cmdclass         = {"uninstall" : uninstall,
+                    "install" : install,
+                    "install_data" : install_data}
+if build_ext:
+    cmdclass['build_ext'] = build_ext
+
 setup (
         name             = "Printrun",
         description      = "Host software for 3D printers",
@@ -151,8 +159,6 @@ setup (
         data_files       = data_files,
         packages         = ["printrun", "printrun.cairosvg", "printrun.server", "printrun.gl", "printrun.gl.libtatlin"],
         scripts          = ["pronsole.py", "pronterface.py", "plater.py", "printcore.py", "prontserve.py"],
-        cmdclass         = {"uninstall" : uninstall,
-                            "install" : install,
-                            "install_data" : install_data},
+        cmdclass         = cmdclass,
         ext_modules      = extensions,
      )