psycopg/psycopg2
1
1
Fork 0
mirror of https://github.com/psycopg/psycopg2.git synced 2025-01-31 17:34:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-iter-warning'

Browse Source
This commit is contained in:
Daniele Varrazzo 2017-01-05 15:27:26 +00:00
commit 8ac839ce95
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/extras.py
View File

@ -106,18 +106,21 @@ class DictCursorBase(_cursor):
return res
def __iter__(self):
if self._prefetch:
res = super(DictCursorBase, self).__iter__()
first = res.next()
if self._query_executed:
self._build_index()
if not self._prefetch:
res = super(DictCursorBase, self).__iter__()
first = res.next()
try:
if self._prefetch:
res = super(DictCursorBase, self).__iter__()
first = res.next()
if self._query_executed:
self._build_index()
if not self._prefetch:
res = super(DictCursorBase, self).__iter__()
first = res.next()
yield first
while 1:
yield res.next()
yield first
while 1:
yield res.next()
except StopIteration:
return
class DictConnection(_connection):
@ -343,17 +346,20 @@ class NamedTupleCursor(_cursor):
return map(nt._make, ts)
def __iter__(self):
it = super(NamedTupleCursor, self).__iter__()
t = it.next()
try:
it = super(NamedTupleCursor, self).__iter__()
t = it.next()
nt = self.Record
if nt is None:
nt = self.Record = self._make_nt()
nt = self.Record
if nt is None:
nt = self.Record = self._make_nt()
yield nt._make(t)
yield nt._make(t)
while 1:
yield nt._make(it.next())
while 1:
yield nt._make(it.next())
except StopIteration:
return
try:
from collections import namedtuple