Make CSRF token string rather than bytes for Django Sessions.

braincore · braincore · commit b38326a80eb5 · 2016-02-17T17:20:24.000-08:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '5.2.1'
+version = '5.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '5.2.1'
+release = '5.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/dropbox/dropbox.py b/dropbox/dropbox.py
@@ -5,7 +5,7 @@
 ]
 
 # TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '5.2.1'
+__version__ = '5.2.2'
 
 import contextlib
 import json
diff --git a/dropbox/oauth.py b/dropbox/oauth.py
@@ -272,7 +272,7 @@ def start(self, url_state=None):
             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)).decode('ascii')
         state = csrf_token
         if url_state is not None:
             state += "|" + url_state
diff --git a/dropbox/rest.py b/dropbox/rest.py
@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "5.2.1"
+SDK_VERSION = "5.2.2"
 
 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='5.2.1',
+    version='5.2.2',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',

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