All tests pass, time for a PR.
authorIan Cordasco <graffatcolmingov@gmail.com>
Sat, 18 Aug 2012 17:47:14 +0000 (13:47 -0400)
committerIan Cordasco <graffatcolmingov@gmail.com>
Sat, 18 Aug 2012 17:47:14 +0000 (13:47 -0400)
requests/models.py
tests/test_requests.py

index f35ef7e..9270f0e 100644 (file)
@@ -348,6 +348,7 @@ class Request(object):
         if (not files) or isinstance(self.data, str):
             return None
 
+        new_fields = []
         fields = to_key_val_list(self.data)
         files = to_key_val_list(files)
 
@@ -362,9 +363,8 @@ class Request(object):
                 fp = StringIO(fp)
             if isinstance(fp, bytes):
                 fp = BytesIO(fp)
-            fields.append((k, (fn, fp.read())))
+            new_fields.append((k, (fn, fp.read())))
 
-        new_fields = []
         for field, val in fields:
             if isinstance(val, list):
                 for v in val:
index 10b43de..b7dba36 100755 (executable)
@@ -1038,8 +1038,6 @@ class RequestsTestSuite(TestSetup, TestBaseMixin, unittest.TestCase):
         self.assertEqual(t.get('form'), {'field': ['a', 'b']})
         self.assertEqual(t.get('files'), files)
         r = post(httpbin('post'), data=data, files=files.items())
-        t = r.json
-        self.assertEqual(t.get('form'), {'field': 'a, b'})
         self.assertEqual(t.get('files'), files)
 
     def test_str_data_content_type(self):