From 5d3e8b90bfe2c6f0fa86829538c64b876478dc83 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Wed, 18 Dec 2013 03:34:03 +0100 Subject: [PATCH] Turn ResultIter class into Python 3 iterator --- dataset/persistence/util.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dataset/persistence/util.py b/dataset/persistence/util.py index 019f620..8b0580c 100644 --- a/dataset/persistence/util.py +++ b/dataset/persistence/util.py @@ -31,14 +31,14 @@ class ResultIter(object): def _next_rp(self): try: - self.rp = self.result_proxies.next() + self.rp = next(self.result_proxies) self.count += self.rp.rowcount self.keys = self.rp.keys() return True except StopIteration: return False - def next(self): + def __next__(self): row = self.rp.fetchone() if row is None: if self._next_rp(): @@ -48,5 +48,7 @@ class ResultIter(object): raise StopIteration return dict(zip(self.keys, row)) + next = __next__ + def __iter__(self): return self