Use params option of Requests, urlencode is useless

william-p · william-p · commit eb6557a613e2 · 2014-03-17T11:51:22.000+01:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -4,8 +4,6 @@
 """
 import json
 
-from six.moves.urllib.parse import urlencode
-
 import requests
 session = requests.Session()
 
@@ -159,20 +157,22 @@ def query(self, query, time_precision='s', chunked=False):
         else:
             chunked_param = 'false'
 
-        encoded_query = urlencode({
-            'q': query})
-
-        url_format = "{0}/db/{1}/series?{2}&u={3}&p={4}"
-        url_format += "&time_precision={5}&chunked={6}"
+        url = "{0}/db/{1}/series"
 
-        response = session.get(url_format.format(
+        url.format(
             self._baseurl,
-            self._database,
-            encoded_query,
-            self._username,
-            self._password,
-            time_precision,
-            chunked_param))
+            self._database
+        )
+
+        params = {
+            'u': self._username,
+            'p': self._password,
+            'q': query,
+            'time_precision': time_precision,
+            'chunked': chunked_param
+        }
+
+        response = session.get(url, params=params)
 
         if response.status_code == 200:
             return json.loads(response.content)
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1 @@
-six
 requests>=1.0.3
