diff options
author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2017-12-02 14:47:29 +0000 |
---|---|---|
committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2017-12-02 14:47:29 +0000 |
commit | 2218e73c2848f9a76c60b6b9a671901be33bf49e (patch) | |
tree | b16e41ea7b06fa6a2ccdd8d60b7713c0100d1c82 /lib/extras.py | |
parent | 7617e1dbf58e2d68641c5d4fcb2f824516320013 (diff) | |
parent | df646831d7a174d6cecdad05fd185e1652296dc4 (diff) | |
download | psycopg2-2218e73c2848f9a76c60b6b9a671901be33bf49e.tar.gz |
Merge branch 'master' into ws
Diffstat (limited to 'lib/extras.py')
-rw-r--r-- | lib/extras.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/extras.py b/lib/extras.py index 3308f78..a6c025e 100644 --- a/lib/extras.py +++ b/lib/extras.py @@ -110,16 +110,16 @@ class DictCursorBase(_cursor): try: if self._prefetch: res = super(DictCursorBase, self).__iter__() - first = res.next() + first = next(res) if self._query_executed: self._build_index() if not self._prefetch: res = super(DictCursorBase, self).__iter__() - first = res.next() + first = next(res) yield first while 1: - yield res.next() + yield next(res) except StopIteration: return @@ -349,7 +349,7 @@ class NamedTupleCursor(_cursor): def __iter__(self): try: it = super(NamedTupleCursor, self).__iter__() - t = it.next() + t = next(it) nt = self.Record if nt is None: @@ -358,7 +358,7 @@ class NamedTupleCursor(_cursor): yield nt._make(t) while 1: - yield nt._make(it.next()) + yield nt._make(next(it)) except StopIteration: return @@ -1144,7 +1144,7 @@ def _paginate(seq, page_size): while 1: try: for i in xrange(page_size): - page.append(it.next()) + page.append(next(it)) yield page page = [] except StopIteration: |