From b2fb51201b896e4bf282d2e59283eb72fd8f6192 Mon Sep 17 00:00:00 2001 From: nomad010 Date: Fri, 20 Jan 2017 22:02:21 +0200 Subject: [PATCH 1/3] Changes batching to allow all iterables --- influxdb/client.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/influxdb/client.py b/influxdb/client.py index ab9aa409..4125fb48 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -7,6 +7,7 @@ from __future__ import print_function from __future__ import unicode_literals +import itertools import json import socket import requests @@ -411,8 +412,10 @@ def write_points(self, tags=tags, protocol=protocol) def _batches(self, iterable, size): - for i in xrange(0, len(iterable), size): - yield iterable[i:i + size] + iterator = iter(iterable) + while True: + batch_iterator = itertools.islice(iterator, size) + yield itertools.chain([batch_iterator.next()], batch_iterator) def _write_points(self, points, From 7ece047c1621d3c9977c5200b29164eb73668315 Mon Sep 17 00:00:00 2001 From: nomad010 Date: Fri, 20 Jan 2017 22:14:15 +0200 Subject: [PATCH 2/3] Fix for python 3 --- influxdb/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/influxdb/client.py b/influxdb/client.py index 4125fb48..92310c78 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -415,7 +415,7 @@ def _batches(self, iterable, size): iterator = iter(iterable) while True: batch_iterator = itertools.islice(iterator, size) - yield itertools.chain([batch_iterator.next()], batch_iterator) + yield itertools.chain([next(batch_iterator)], batch_iterator) def _write_points(self, points, From 8719db2a4a3028f6ca8ed4008d8df691f1bb55ec Mon Sep 17 00:00:00 2001 From: nomad010 Date: Mon, 23 Jan 2017 09:52:31 +0200 Subject: [PATCH 3/3] Trigger CI rebuild