Merge pull request #2 from maxwell-k/python3

Merging PR.  Decode url content if on Python 3

googleapiclient/discovery.py

@@ -25,9 +25,10 @@
            ]
 
 
+import six
 from six import StringIO
 from six.moves.urllib.parse import urlencode, urlparse, urljoin,\
-      urlunparse, parse_qs, parse_qsl
+    urlunparse, parse_qsl
 
 # Standard library imports
 import copy
@@ -64,8 +65,6 @@
 from oauth2client.util import _add_query_parameter
 from oauth2client.util import positional
 
-import sys
-
 # The client library requires a version of httplib2 that supports RETRIES.
 httplib2.RETRIES = 1
 
@@ -216,6 +215,8 @@ def build(serviceName,
   logger.info('URL being requested: GET %s' % requested_url)
 
   resp, content = http.request(requested_url)
+  if six.PY3 and isinstance(content, bytes):
+    content = content.decode('utf-8')
 
   if resp.status == 404:
     raise UnknownApiNameOrVersion("name: %s  version: %s" % (serviceName,
@@ -224,8 +225,8 @@ def build(serviceName,
     raise HttpError(resp, content, uri=requested_url)
 
   try:
-    service = json.loads(content)
-  except ValueError as e:
+    json.loads(content)
+  except ValueError:
     logger.error('Failed to parse as JSON: ' + content)
     raise InvalidJsonError()