Fixes issue #85. Also moves all json imports to go through oauth2client.anyjson. Reviewed in http://codereview.appspot.com/5531064/.
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index 9344392..a2c81c6 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -39,7 +39,6 @@
except ImportError:
from cgi import parse_qsl
-from apiclient.anyjson import simplejson
from apiclient.errors import HttpError
from apiclient.errors import InvalidJsonError
from apiclient.errors import MediaUploadSizeError
@@ -54,6 +53,7 @@
from apiclient.schema import Schemas
from email.mime.multipart import MIMEMultipart
from email.mime.nonmultipart import MIMENonMultipart
+from oauth2client.anyjson import simplejson
URITEMPLATE = re.compile('{[^}]*}')