Skip to content

Commit e21f129

Browse files
committed
__init__.py now imports oauth2_version, a derivation of oauth2 that has improved compatibility with older versions of python. It also imports parse_qs from cgi when using Python 2.5 or older.
1 parent 0b1d66a commit e21f129

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

ox3apiclient/__init__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@
1414
except ImportError:
1515
import simplejson as json
1616

17-
import oauth2 as oauth
17+
18+
import oauth2_version as oauth
19+
1820
import urllib
1921
import urllib2
2022

2123
# parse_qs is in the urlparse module as of 2.6, but in cgi in earlier versions.
22-
try:
24+
import sys
25+
major_py_version = sys.version_info[0]
26+
minor_py_version = sys.version_info[1]
27+
if major_py_version == 2 and minor_py_version > 5:
2328
from urlparse import parse_qs
24-
except ImportError:
29+
else:
2530
from cgi import parse_qs
2631

2732
import urlparse

0 commit comments

Comments
 (0)