Use six for python3/2 compatibility

smly · smly · commit ed17edaebb1f · 2013-11-08T11:20:21.000+09:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -3,7 +3,8 @@
 python client for influxdb
 """
 import json
-import urllib
+
+from six.moves.urllib.parse import urlencode
 
 import requests
 
@@ -169,7 +170,7 @@ def query(self, query, time_precision='s', chunked=False):
         else:
             chunked_param = 'false'
 
-        encoded_query = urllib.urlencode({
+        encoded_query = urlencode({
             'q': query})
 
         url_format = "{0}/db/{1}/series?{2}&u={3}&p={4}"
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,2 @@
+six
 requests
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -2,6 +2,8 @@
 """
 unit tests
 """
+import json
+
 import requests
 from nose.tools import raises
 from mock import patch
@@ -97,7 +99,14 @@ def test_remove_scheduled_delete(self):
         cli.remove_scheduled_delete(1)
 
     def test_query(self):
-        pass
+        expected = """[{"name":"foo","columns":["time","sequence_number","column_one"],"points":[[1383876043,16,"2"],[1383876043,15,"1"],[1383876035,14,"2"],[1383876035,13,"1"]]}]"""
+        with patch.object(requests, 'get') as mocked_get:
+            mocked_get.return_value = _build_response_object(
+                status_code=200,
+                content=expected)
+            cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
+            result = cli.query('select column_one from foo;')
+            assert len(json.loads(result)[0]['points']) == 4
 
     def test_create_database(self):
         with patch.object(requests, 'post') as mocked_post:
