Make urlencode load properly in python 3.

etienned · Nov 14, 2014 · f04e32c · f04e32c
1 parent 14762a7
commit f04e32c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/vimeo/auth/authorization_code.py b/vimeo/auth/authorization_code.py
@@ -3,10 +3,16 @@
 
 from __future__ import absolute_import
 
-import urllib
 from .base import AuthenticationMixinBase
 from . import GrantFailed
 
+# We need to get urlencode from urllib.parse in Python 3, but fall back to
+# urllib in Python 2
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
+
 try:
     basestring
 except NameError:
@@ -33,7 +39,7 @@ def auth_url(self, scope, redirect):
         if redirect:
             query['redirect_uri'] = redirect
 
-        return url + urllib.urlencode(query)
+        return url + urlencode(query)
 
     def exchange_code(self, code, redirect):
         """Perform the exchange step for the code from the redirected user."""