Merge pull request influxdata#18 from lra/hotfix

toddboom · toddboom · commit 6ed3f0bb20ee · 2014-03-29T22:35:51.000-04:00
Fix query() so that it builds a valid URL.
diff --git a/examples/tutorial.py b/examples/tutorial.py
@@ -3,7 +3,7 @@
 from influxdb import InfluxDBClient
 
 
-def main(host=None, port=None):
+def main(host='localhost', port=8086):
     user = 'root'
     password = 'root'
     dbname = 'example'
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -157,12 +157,8 @@ def query(self, query, time_precision='s', chunked=False):
         else:
             chunked_param = 'false'
 
-        url = "{0}/db/{1}/series"
-
-        url.format(
-            self._baseurl,
-            self._database
-        )
+        # Build the URL of the serie to query
+        url = "{0}/db/{1}/series".format(self._baseurl, self._database)
 
         params = {
             'u': self._username,
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -160,14 +160,16 @@ def test_get_database_list_fails(self):
 
     def test_delete_series(self):
         with patch.object(session, 'delete') as mocked_delete:
-            mocked_delete.return_value = _build_response_object(status_code=204)
+            mocked_delete.return_value = _build_response_object(
+                status_code=204)
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             cli.delete_series('old_series')
 
     @raises(Exception)
     def test_delete_series_fails(self):
         with patch.object(session, 'delete') as mocked_delete:
-            mocked_delete.return_value = _build_response_object(status_code=401)
+            mocked_delete.return_value = _build_response_object(
+                status_code=401)
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             cli.delete_series('old_series')
 
