Fixed relative imports in apiclient

apiclient/discovery.py

@@ -33,11 +33,11 @@ try:
 except ImportError:
     from cgi import parse_qsl
 
-from apiclient.http import HttpRequest
-from apiclient.json import simplejson
-from apiclient.model import JsonModel
-from apiclient.errors import HttpError
-from apiclient.errors import UnknownLinkType
+from http import HttpRequest
+from json import simplejson
+from model import JsonModel
+from errors import HttpError
+from errors import UnknownLinkType
 
 URITEMPLATE = re.compile('{[^}]*}')
 VARNAME = re.compile('[a-zA-Z0-9_-]+')

apiclient/model.py

@@ -15,8 +15,8 @@ __author__ = 'jcgregorio@google.com (Joe Gregorio)'
 import logging
 import urllib
 
-from apiclient.json import simplejson
-from apiclient.errors import HttpError
+from anyjson import simplejson
+from errors import HttpError
 
 
 class JsonModel(object):

contrib/buzz/buzz_gae_client.py

@@ -12,7 +12,7 @@ import urllib
 import urlparse
 
 try:
-  from urlparse import parse_qs, parse_qsl, urlparse
+  from urlparse import parse_qs, parse_qsl
 except ImportError:
   from cgi import parse_qs, parse_qsl
 

discovery_extras.py

@@ -25,7 +25,7 @@ import os
 import os.path
 import sys
 
-from apiclient.json import simplejson
+from anyjson import simplejson
 
 
 def main():

runtests.py

@@ -53,7 +53,7 @@ def main():
     logging.disable(logging.ERROR)
   elif verbosity == 2:
     logging.basicConfig(level=logging.DEBUG)
-  
+
   # Allow user to run a specific folder of tests
   if 'tests' in sys.argv:
     run('tests', verbosity)
@@ -67,4 +67,4 @@ def main():
     run('contrib_tests', verbosity)
 
 if __name__ == '__main__':
-  main()
+  main()