Merge branch 'master' of git://github.com/chrisdickinson/python-oauth2

Author: joestump

oauth2/__init__.py

@@ -586,11 +586,14 @@ def set_signature_method(self, method):
 
     def request(self, uri, method="GET", body=None, headers=None, 
         redirections=httplib2.DEFAULT_MAX_REDIRECTS, connection_type=None):
-        
+        DEFAULT_CONTENT_TYPE = 'application/x-www-form-urlencoded'
+
         if not isinstance(headers, dict):
             headers = {}
 
-        if body and method == "POST":
+        is_multipart = method == 'POST' and headers.get('Content-Type', DEFAULT_CONTENT_TYPE) != DEFAULT_CONTENT_TYPE
+
+        if body and method == "POST" and not is_multipart:
             parameters = dict(parse_qsl(body))
         elif method == "GET":
             parsed = urlparse.urlparse(uri)
@@ -609,9 +612,13 @@ def request(self, uri, method="GET", body=None, headers=None,
 
         req.sign_request(self.method, self.consumer, self.token)
 
+
         if method == "POST":
-            body = req.to_postdata() 
-            headers['Content-Type'] = 'application/x-www-form-urlencoded'
+            headers['Content-Type'] = headers.get('Content-Type', DEFAULT_CONTENT_TYPE)
+            if is_multipart:
+                headers.update(req.to_header())
+            else:
+                body = req.to_postdata()
         elif method == "GET":
             uri = req.to_url()
         else:

tests/test_oauth.py

@@ -31,7 +31,8 @@
 import urllib
 import urlparse
 from types import ListType
-
+import mox
+import httplib2
 
 # Fix for python2.5 compatibility
 try:
@@ -737,6 +738,7 @@ class TestClient(unittest.TestCase):
     host = 'http://oauth-sandbox.sevengoslings.net'
 
     def setUp(self):
+        self.mox = mox.Mox()
         self.consumer = oauth.Consumer(key=self.consumer_key,
             secret=self.consumer_secret)
 
@@ -747,13 +749,31 @@ def setUp(self):
             'blah': 599999
         }
 
+    def tearDown(self):
+        self.mox.UnsetStubs()
+
     def _uri(self, type):
         uri = self.oauth_uris.get(type)
         if uri is None:
             raise KeyError("%s is not a valid OAuth URI type." % type)
 
         return "%s%s" % (self.host, uri)
 
+    def create_simple_multipart_data(self, data):
+        boundary = '---Boundary-%d' % random.randint(1,1000)
+        crlf = '\r\n'
+        items = []
+        for key, value in data.iteritems():
+            items += [
+                '--'+boundary,
+                'Content-Disposition: form-data; name="%s"'%str(key),
+                '',
+                str(value),
+            ]
+        items += ['', '--'+boundary+'--', '']
+        content_type = 'multipart/form-data; boundary=%s' % boundary
+        return content_type, crlf.join(items)
+
     def test_access_token_get(self):
         """Test getting an access token via GET."""
         client = oauth.Client(self.consumer, None)
@@ -789,6 +809,32 @@ def test_two_legged_get(self):
         resp, content = self._two_legged("GET")
         self.assertEquals(int(resp['status']), 200)
 
+    def test_multipart_post_does_not_alter_body(self):
+        self.mox.StubOutWithMock(httplib2.Http, 'request')
+        random_result = random.randint(1,100)
+
+        data = {
+            'rand-%d'%random.randint(1,100):random.randint(1,100),
+        }
+        content_type, body = self.create_simple_multipart_data(data)
+
+        client = oauth.Client(self.consumer, None)
+        uri = self._uri('two_legged')
+
+        expected_kwargs = {
+            'method':'POST',
+            'body':body,
+            'redirections':httplib2.DEFAULT_MAX_REDIRECTS,
+            'connection_type':None,
+            'headers':mox.IsA(dict),
+        }
+        httplib2.Http.request(client, uri, **expected_kwargs).AndReturn(random_result)
+
+        self.mox.ReplayAll()
+        result = client.request(uri, 'POST', headers={'Content-Type':content_type}, body=body)
+        self.assertEqual(result, random_result)
+        self.mox.VerifyAll()
+
 if __name__ == "__main__":
     unittest.main()