Merge pull request googleapis#38 from craigcitro/imports3

Drop uritemplate.

Author: craigcitro

oauth2client/gce.py

@@ -21,7 +21,7 @@
 
 import json
 import logging
-import uritemplate
+import urllib
 
 from oauth2client import util
 from oauth2client.client import AccessTokenRefreshError
@@ -78,7 +78,8 @@ def _refresh(self, http_request):
     Raises:
       AccessTokenRefreshError: When the refresh fails.
     """
-    uri = uritemplate.expand(META, {'scope': self.scope})
+    query = '?scope=%s' % urllib.quote(self.scope, '')
+    uri = META.replace('{?scope}', query)
     response, content = http_request(uri)
     if response.status == 200:
       try:
@@ -101,5 +102,4 @@ def create_scoped_required(self):
     return not self.scope
 
   def create_scoped(self, scopes):
-    return AppAssertionCredentials(scopes,
-                                   **self.kwargs)
+    return AppAssertionCredentials(scopes, **self.kwargs)

setup.py

@@ -29,7 +29,6 @@
 
 packages = [
     'oauth2client',
-    'uritemplate',
 ]
 
 install_requires = [