From a654fd2225327487d4812817069e863fe02b68bb Mon Sep 17 00:00:00 2001 From: Dan <22e889d8@opayq.com> Date: Thu, 16 Mar 2017 13:41:07 +0000 Subject: [PATCH] Py3 compatiblity. Added py 2.6 to allowed failures --- .travis.yml | 2 ++ influxgraph/utils.py | 2 +- tests/test_influxdb_integration.py | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a9955d..ce21e45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ python: - pypy env: - INFLUXDB_VERSION=1.2.0 +allow_failures: + - python: 2.6 before_install: - pip install -U pip setuptools wheel - wget https://dl.influxdata.com/influxdb/releases/influxdb_${INFLUXDB_VERSION}_amd64.deb diff --git a/influxgraph/utils.py b/influxgraph/utils.py index e7b05d4..6529eac 100644 --- a/influxgraph/utils.py +++ b/influxgraph/utils.py @@ -174,7 +174,7 @@ def _retrieve_named_field_data(infl_data, measurement_data, measurement, tags, _ split_path = [] _make_path_from_template( split_path, measurement, - measurement_data[measurement]['template'], tags.items(), + measurement_data[measurement]['template'], list(tags.items()), separator=separator) split_path = [p[1] for p in heapsort(split_path)] split_path.append(field) diff --git a/tests/test_influxdb_integration.py b/tests/test_influxdb_integration.py index d4a62b7..f3649f3 100644 --- a/tests/test_influxdb_integration.py +++ b/tests/test_influxdb_integration.py @@ -159,7 +159,6 @@ def test_find_branch(self): (self.end_time - datetime.timedelta(minutes=2)).strftime("%Y-%m-%dT%H:%M:%SZ"), ]] self.assertTrue(self.client.write_points(data)) - # import ipdb; ipdb.set_trace() self.finder.build_index() query = Query(prefix + '.*') # Test getting leaf nodes with wildcard