Merge remote-tracking branch 'origin/master'

AUTHORS.rst

@@ -118,3 +118,4 @@ Patches and Suggestions
 - Martijn Pieters
 - Jonatan Heyman
 - David Bonner <[email protected]> @rascalking
+- Vinod Chandru

requests/models.py

@@ -108,16 +108,25 @@ def _encode_files(files, data):
 
         for (k, v) in files:
             # support for explicit filename
+            ft = None
             if isinstance(v, (tuple, list)):
-                fn, fp = v
+                if len(v) == 2:
+                    fn, fp = v
+                else:
+                    fn, fp, ft = v
             else:
                 fn = guess_filename(v) or k
                 fp = v
             if isinstance(fp, str):
                 fp = StringIO(fp)
             if isinstance(fp, bytes):
                 fp = BytesIO(fp)
-            new_fields.append((k, (fn, fp.read())))
+
+            if ft:
+                new_v = (fn, fp.read(), ft)
+            else:
+                new_v = (fn, fp.read())
+            new_fields.append((k, new_v))
 
         body, content_type = encode_multipart_formdata(new_fields)
 

requests/sessions.py

@@ -49,9 +49,20 @@ def merge_kwargs(local_kwarg, default_kwarg):
     default_kwarg = from_key_val_list(default_kwarg)
     local_kwarg = from_key_val_list(local_kwarg)
 
-    # Update new values.
+    # Update new values in a case-insensitive way
+    def get_original_key(original_keys, new_key):
+        """
+        Finds the key from original_keys that case-insensitive matches new_key.
+        """
+        for original_key in original_keys:
+            if key.lower() == original_key.lower():
+                return original_key
+        return new_key
+
     kwargs = default_kwarg.copy()
-    kwargs.update(local_kwarg)
+    original_keys = kwargs.keys()
+    for key, value in local_kwarg.items():
+        kwargs[get_original_key(original_keys, key)] = value
 
     # Remove keys that are set to None.
     for (k, v) in local_kwarg.items():

test_requests.py

@@ -255,6 +255,14 @@ def test_different_encodings_dont_break_post(self):
                           files={'file': ('test_requests.py', open(__file__, 'rb'))})
         self.assertEqual(r.status_code, 200)
 
+    def test_custom_content_type(self):
+        r = requests.post(httpbin('post'),
+                          data={'stuff': json.dumps({'a': 123})},
+                          files={'file1': ('test_requests.py', open(__file__, 'rb')),
+                                 'file2': ('test_requests', open(__file__, 'rb'),
+                                           'text/py-content-type')})
+        self.assertEqual(r.status_code, 200)
+        self.assertTrue(b"text/py-content-type" in r.request.body)
 
 
 if __name__ == '__main__':