Merge pull request influxdata#393 from eman/fix_dataframe_constructor (Thanks @eman!)

aviau · web-flow · commit c9fcede02e1d · 2016-12-09T11:25:55.000-05:00
Fix for from_DSN() constructor when using DataFrameClient
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -131,8 +131,8 @@ def _port(self):
     def _get_port(self):
         return self.__port
 
-    @staticmethod
-    def from_DSN(dsn, **kwargs):
+    @classmethod
+    def from_DSN(cls, dsn, **kwargs):
         """Return an instance of :class:`~.InfluxDBClient` from the provided
         data source name. Supported schemes are "influxdb", "https+influxdb"
         and "udp+influxdb". Parameters for the :class:`~.InfluxDBClient`
@@ -169,7 +169,7 @@ def from_DSN(dsn, **kwargs):
         init_args['port'] = port
         init_args.update(kwargs)
 
-        return InfluxDBClient(**init_args)
+        return cls(**init_args)
 
     def switch_database(self, database):
         """Change the client's database.
diff --git a/influxdb/tests/dataframe_client_test.py b/influxdb/tests/dataframe_client_test.py
@@ -566,3 +566,8 @@ def test_datetime_to_epoch(self):
             cli._datetime_to_epoch(timestamp, time_precision='n'),
             1356998400000000000.0
         )
+
+    def test_dsn_constructor(self):
+        client = DataFrameClient.from_DSN('influxdb://localhost:8086')
+        self.assertIsInstance(client, DataFrameClient)
+        self.assertEqual('http://localhost:8086', client._baseurl)

Original file line number	Diff line number	Diff line change
`@@ -566,3 +566,8 @@ def test_datetime_to_epoch(self):`
`566`	`566`	`cli._datetime_to_epoch(timestamp, time_precision='n'),`
`567`	`567`	`1356998400000000000.0`
`568`	`568`	`)`
	`569`	`+`
	`570`	`+ def test_dsn_constructor(self):`
	`571`	`+ client = DataFrameClient.from_DSN('influxdb://localhost:8086')`
	`572`	`+ self.assertIsInstance(client, DataFrameClient)`
	`573`	`+ self.assertEqual('http://localhost:8086', client._baseurl)`