Skip to content

Commit d99ca61

Browse files
committed
Python version is now used to figure out whether to import json or simplejson. There exists a completely different module named json independent of the one included in Python 2.6.
1 parent e21f129 commit d99ca61

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

ox3apiclient/__init__.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@
99
# simplejson module instead. Note that as of simplejson v2.1.1, Python 2.4
1010
# support was dropped. You will need to look for v2.1.0 specifically for
1111
# Python 2.4 support.
12-
try:
13-
import json
14-
except ImportError:
12+
import sys
13+
major_py_version = sys.version_info[0]
14+
minor_py_version = sys.version_info[1]
15+
if major_py_version == 2 and minor_py_version < 6:
1516
import simplejson as json
16-
17+
else:
18+
import json
1719

1820
import oauth2_version as oauth
1921

2022
import urllib
2123
import urllib2
2224

2325
# parse_qs is in the urlparse module as of 2.6, but in cgi in earlier versions.
24-
import sys
25-
major_py_version = sys.version_info[0]
26-
minor_py_version = sys.version_info[1]
2726
if major_py_version == 2 and minor_py_version > 5:
2827
from urlparse import parse_qs
2928
else:

0 commit comments

Comments
 (0)