From 6587076b11a1a183e15be67d8cce03b2b8f20208 Mon Sep 17 00:00:00 2001 From: William Pain Date: Wed, 18 Nov 2015 09:59:55 +0100 Subject: [PATCH] Allow netloc with "." --- influxdb/client.py | 2 +- influxdb/tests/client_test.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/influxdb/client.py b/influxdb/client.py index d16c4937..51e59921 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -866,7 +866,7 @@ def parse_dsn(dsn): def _parse_netloc(netloc): import re - parsed = re.findall(r'(\w*):(\w*)@(\w*):(\d*)', netloc) + parsed = re.findall(r'(\w*):(\w*)@([a-zA-Z0-9_\.]*):(\d*)', netloc) if not parsed: raise ValueError('Invalid netloc "{}".'.format(netloc)) diff --git a/influxdb/tests/client_test.py b/influxdb/tests/client_test.py index 27f2c6f3..8df4bd64 100644 --- a/influxdb/tests/client_test.py +++ b/influxdb/tests/client_test.py @@ -95,7 +95,7 @@ def setUp(self): } ] - self.dsn_string = 'influxdb://uSr:pWd@host:1886/db' + self.dsn_string = 'influxdb://uSr:pWd@my.host.fr:1886/db' def test_scheme(self): cli = InfluxDBClient('host', 8086, 'username', 'password', 'database') @@ -108,7 +108,7 @@ def test_scheme(self): def test_dsn(self): cli = InfluxDBClient.from_DSN(self.dsn_string) - self.assertEqual('http://host:1886', cli._baseurl) + self.assertEqual('http://my.host.fr:1886', cli._baseurl) self.assertEqual('uSr', cli._username) self.assertEqual('pWd', cli._password) self.assertEqual('db', cli._database) @@ -118,11 +118,11 @@ def test_dsn(self): self.assertTrue(cli.use_udp) cli = InfluxDBClient.from_DSN('https+' + self.dsn_string) - self.assertEqual('https://host:1886', cli._baseurl) + self.assertEqual('https://my.host.fr:1886', cli._baseurl) cli = InfluxDBClient.from_DSN('https+' + self.dsn_string, **{'ssl': False}) - self.assertEqual('http://host:1886', cli._baseurl) + self.assertEqual('http://my.host.fr:1886', cli._baseurl) def test_switch_database(self): cli = InfluxDBClient('host', 8086, 'username', 'password', 'database')