Fixes issue #85. Also moves all json imports to go through oauth2client.anyjson. Reviewed in http://codereview.appspot.com/5531064/.
diff --git a/oauth2client/client.py b/oauth2client/client.py
index 07df411..46d6cff 100644
--- a/oauth2client/client.py
+++ b/oauth2client/client.py
@@ -31,6 +31,7 @@
import urllib
import urlparse
+from anyjson import simplejson
HAS_OPENSSL = False
try:
@@ -41,16 +42,6 @@
except ImportError:
pass
-try: # pragma: no cover
- import simplejson
-except ImportError: # pragma: no cover
- try:
- # Try to import from django, should work on App Engine
- from django.utils import simplejson
- except ImportError:
- # Should work for Python2.6 and higher.
- import json as simplejson
-
try:
from urlparse import parse_qsl
except ImportError: