All tests pass, time for a PR.

diff --git a/requests/models.py b/requests/models.py
index f35ef7e1b05831de0ca1f7acf5de9c288cf6bee3..9270f0ea7ad70c02e0e5f30dc5b92e188630039a 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -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:

diff --git a/tests/test_requests.py b/tests/test_requests.py
index 10b43deb5383be99c74928aa882b18f9d2ab116d..b7dba3697ed4b2ed7e68b2462c01a365b3d50ad6 100755 (executable)
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -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):