Consolidate all of the wonky code for the various places that simplejson could be imported from all into one place.
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index 945db74..f853c44 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -33,17 +33,7 @@
except ImportError:
from cgi import parse_qsl
from apiclient.http import HttpRequest
-
-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 apiclient.json import simplejson
class Error(Exception):
"""Base error for this module."""