commit 549230c5b66c12ea8619238168a3d596c78cf485
author Joe Gregorio <jcgregorio@google.com> Wed Jan 11 10:38:05 2012 -0500
committer Joe Gregorio <jcgregorio@google.com> Wed Jan 11 10:38:05 2012 -0500
tree b6b9790b9f8b3f1bc08b08f1da129b33136ee62f
parent 788ecb9a0815e594a765bf9adea45a1a3912e70e

Fixes issue #85. Also moves all json imports to go through oauth2client.anyjson.  Reviewed in http://codereview.appspot.com/5531064/.

oauth2client/clientsecrets.py

diff --git a/oauth2client/clientsecrets.py b/oauth2client/clientsecrets.py
index da48be7..1327a2a 100644
--- a/oauth2client/clientsecrets.py
+++ b/oauth2client/clientsecrets.py
@@ -21,15 +21,7 @@
 __author__ = 'jcgregorio@google.com (Joe Gregorio)'
 
 
-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
+from anyjson import simplejson
 
 # Properties that make a client_secrets.json file valid.
 TYPE_WEB = 'web'