Ensure that csrf_token is a str for PY3.

braincore · braincore · commit 63eeab64c199 · 2015-09-08T19:30:09.000-07:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.26'
+version = '3.27'
 # The full version, including alpha/beta/rc tags.
-release = '3.26'
+release = '3.27'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/dropbox/client.py b/dropbox/client.py
@@ -1506,7 +1506,9 @@ def start(self, url_state=None):
             your app, which gives your app permission to access the user's Dropbox account.
             Tell the user to visit this URL and approve your app.
         """
-        csrf_token = base64.urlsafe_b64encode(os.urandom(16))
+        csrf_token = base64.urlsafe_b64encode(os.urandom(16))  # PY3: Returns bytes
+        if not isinstance(csrf_token, str):
+            csrf_token = csrf_token.decode('utf-8')
         state = csrf_token
         if url_state is not None:
             state += "|" + url_state
diff --git a/dropbox/dropbox.py b/dropbox/dropbox.py
@@ -3,7 +3,7 @@
 ]
 
 # TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '3.26'
+__version__ = '3.27'
 
 import contextlib
 import json
diff --git a/dropbox/rest.py b/dropbox/rest.py
@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "3.26"
+SDK_VERSION = "3.27"
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 
 dist = setup(
     name='dropbox',
-    version='3.26',
+    version='3.27',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`]`
`4`	`4`
`5`	`5`	`# TODO(kelkabany): We need to auto populate this as done in the v1 SDK.`
`6`		`-__version__ = '3.26'`
	`6`	`+__version__ = '3.27'`
`7`	`7`
`8`	`8`	`import contextlib`
`9`	`9`	`import json`