Fixes #1425

stamparm · stamparm · commit 29bdcf0e651c · 2015-09-23T15:31:25.000+02:00
diff --git a/thirdparty/multipart/multipartpost.py b/thirdparty/multipart/multipartpost.py
@@ -73,7 +73,7 @@ def http_request(self, request):
             request.add_data(data)
         return request
 
-    def multipart_encode(vars, files, boundary = None, buf = None):
+    def multipart_encode(vars, files, boundary=None, buf=None):
         if boundary is None:
             boundary = mimetools.choose_boundary()
 
@@ -100,7 +100,7 @@ def multipart_encode(vars, files, boundary = None, buf = None):
             # buf += 'Content-Length: %s\r\n' % file_size
             fd.seek(0)
 
-            buf = str(buf)
+            buf = str(buf) if not isinstance(buf, unicode) else buf.encode("utf8")
             buf += '\r\n%s\r\n' % fd.read()
 
         buf += '--%s--\r\n\r\n' % boundary
