Merge commit '545f832f48a351caee066550535ed0e485fd8f20'

Author: Simple Geebus

oauth2/__init__.py

@@ -31,7 +31,12 @@
 import binascii
 import httplib2
 
-from urlparse import parse_qs
+try:
+    from urlparse import parse_qs
+    parse_qs # placate pyflakes
+except ImportError:
+    # fall back for Python 2.5
+    from cgi import parse_qs
 
 try:
     from hashlib import sha1