Fix PY3 encoding of parameters for OAuth flow.

Author: braincore

docs/conf.py

@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '5.2'
+version = '5.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '5.2'
+release = '5.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

dropbox/dropbox.py

@@ -5,7 +5,7 @@
 ]
 
 # TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '5.2'
+__version__ = '5.2.1'
 
 import contextlib
 import json

dropbox/oauth.py

@@ -436,9 +436,13 @@ def _params_to_urlencoded(params):
     the exception of unicode objects which are utf8-encoded.
     """
     def encode(o):
-        if isinstance(o, six.text_type):
-            return o.encode('utf8')
+        if isinstance(o, six.binary_type):
+            return o
         else:
-            return str(o)
+            if isinstance(o, six.text_type):
+                return o.encode('utf-8')
+            else:
+                return str(o).encode('utf-8')
+
     utf8_params = {encode(k): encode(v) for k, v in six.iteritems(params)}
     return url_encode(utf8_params)

dropbox/rest.py

@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "5.2"
+SDK_VERSION = "5.2.1"
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 

setup.py

@@ -25,7 +25,7 @@
 
 dist = setup(
     name='dropbox',
-    version='5.2',
+    version='5.2.1',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='[email protected]',