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

prontserve.py

@@ -94,13 +94,16 @@ class StopHandler(tornado.web.RequestHandler):
     prontserve.do_stop()
     self.finish("ACK")
 
+from cStringIO import StringIO
+
 @tornado.web.stream_body
 class JobsHandler(tornado.web.RequestHandler):
 
   def post(self):
     self.read_bytes = 0
     self.total_bytes = self.request.content_length
-    self.chunks = []
+    self.file_str = StringIO()
+
     print self.request
     session_uuid = self.get_argument("session_uuid", None)
     print "me"
@@ -115,7 +118,7 @@ class JobsHandler(tornado.web.RequestHandler):
 
   def read_chunks(self, chunk=''):
     self.read_bytes += len(chunk)
-    self.chunks.append(chunk)
+    self.file_str.write(chunk)
     if chunk: self.process_chunk()
 
     chunk_length = min(100000, self.request.content_length - self.read_bytes)
@@ -123,7 +126,7 @@ class JobsHandler(tornado.web.RequestHandler):
       self.request.connection.stream.read_bytes(
               chunk_length, self.read_chunks)
     else:
-      self.request._on_request_body(''.join(self.chunks), self.uploaded)
+      self.request._on_request_body(self.file_str.getvalue(), self.uploaded)
 
   def process_chunk(self):
     print self.get_argument("session_uuid", None)