handle multipart/form-data correctly for more than one file and with …

…params/data

CloudFlare/cloudflare.py

@@ -194,6 +194,14 @@ def _call_network(self, method, headers, parts, identifiers, params, data, files
                     if parts[4]:
                         url += '/' + parts[4]
 
+            if files and data:
+                # Can't send data and form data - so move data into files and send as multipart/form-data
+                new_files = []
+                new_files += [(f, (files[f].name, files[f])) for f in files]
+                new_files += [(d, (None, data[d])) for d in data]
+                files = tuple(new_files)
+                data = None
+
             if self.logger:
                 msg = build_curl(method, url, headers, params, data, files)
                 self.logger.debug('Call: emulated curl command ...\n%s', msg)

CloudFlare/utils.py

@@ -63,7 +63,16 @@ def build_curl(method, url, headers, params, data, files):
         msg.append('            --data \'%s\' \\' % (str_data.replace('\n', ' ')))
     # files
     if files is not None:
-        msg.append('            --form "file=@%s" \\' % (files))
+        if isinstance(files, (list, tuple)):
+            for f in files:
+                if f[1][0] is None:
+                    # not a file
+                    msg.append('            --form "%s=%s" \\' % (f[0], f[1][1]))
+                else:
+                    # a file
+                    msg.append('            --form "%s=@%s" \\' % (f[0], f[1][0]))
+        else:
+            msg.append('            --form "file=@%s" \\' % (files))
 
     # remove the last \ from the last line.
     msg[-1] = msg[-1][:-1]