Update urllib to use six package (#117)

* Use six to make urllib py2 and py3 compatible

* Update release to 1.0.9

* Update release to 1.0.9

* Update change log

Author: shifucun

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.9
+
+**Date** - 02/04/2020
+
+**Release Tag** - [v1.0.9](https://github.com/datacommonsorg/api-python/releases/tag/v1.0.9)
+
+**Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
+
+New features added to the Python Client API
+
+-   Use six package for urllib.
+
 ## 1.0.7
 
 **Date** - 02/04/2020

datacommons/query.py

@@ -25,7 +25,8 @@
 
 import json
 import os
-import urllib.request
+import six.moves.urllib.error
+import six.moves.urllib.request
 
 # ----------------------------- WRAPPER FUNCTIONS -----------------------------
 
@@ -95,14 +96,14 @@ def query(query_string, select=None):
     'x-api-key': os.environ[_ENV_VAR_API_KEY],
     'Content-Type': 'application/json'
   }
-  req = urllib.request.Request(
+  req = six.moves.urllib.request.Request(
     req_url,
     data=json.dumps({'sparql': query_string}).encode("utf-8"),
     headers=headers)
 
   try:
-    res = urllib.request.urlopen(req)
-  except urllib.error.HTTPError as e:
+    res = six.moves.urllib.request.urlopen(req)
+  except six.moves.urllib.error.HTTPError as e:
     raise ValueError(
         'Response error: An HTTP {} code was returned by the mixer. Printing '
         'response\n\n{}'.format(e.code, e.read()))

datacommons/utils.py

@@ -25,7 +25,8 @@
 import base64
 import json
 import os
-import urllib.request
+import six.moves.urllib.error
+import six.moves.urllib.request
 import zlib
 
 
@@ -98,14 +99,14 @@ def _send_request(req_url, req_json={}, compress=False, post=True):
 
   # Send the request and verify the request succeeded
   if post:
-    req = urllib.request.Request(
+    req = six.moves.urllib.request.Request(
       req_url,
       data=json.dumps(req_json).encode('utf-8'),
       headers=headers)
   else:
-    req = urllib.request.Request(req_url, headers=headers)
+    req = six.moves.urllib.request.Request(req_url, headers=headers)
   try:
-    res = urllib.request.urlopen(req)
+    res = six.moves.urllib.request.urlopen(req)
   except urllib.error.HTTPError as e:
     raise ValueError(
         'Response error: An HTTP {} code was returned by the mixer. Printing '

requirements.bazel.txt

@@ -1,3 +1,4 @@
+six
 mock
 httplib2
 sphinx

setup.py

@@ -25,9 +25,10 @@
 EMAIL = 'support@datacommons.org'
 AUTHOR = 'datacommons.org'
 REQUIRES_PYTHON = '>=2.7'
-VERSION = '1.0.7'
+VERSION = '1.0.9'
 
 REQUIRED = [
+    'six',
     'httplib2',
     'sphinx',
     'sphinxcontrib-napoleon',