Try to fix #365.

Browse Source
This commit is contained in:
Friedrich Lindenberg 2021-04-22 18:51:20 +02:00
parent 45794d349f
commit c13b79fc59
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dataset/util.py
View File

@ -19,7 +19,6 @@ def convert_row(row_type, row):
def iter_result_proxy(rp, step=None): def iter_result_proxy(rp, step=None):
"""Iterate over the ResultProxy.""" """Iterate over the ResultProxy."""
try:
while True: while True:
if step is None: if step is None:
chunk = rp.fetchall() chunk = rp.fetchall()
@ -29,8 +28,6 @@ def iter_result_proxy(rp, step=None):
break break
for row in chunk: for row in chunk:
yield row yield row
except ResourceClosedError:
return
class ResultIter(object): class ResultIter(object):
@ -40,8 +37,12 @@ class ResultIter(object):
def __init__(self, result_proxy, row_type=row_type, step=None): def __init__(self, result_proxy, row_type=row_type, step=None):
self.row_type = row_type self.row_type = row_type
self.result_proxy = result_proxy self.result_proxy = result_proxy
try:
self.keys = list(result_proxy.keys()) self.keys = list(result_proxy.keys())
self._iter = iter_result_proxy(result_proxy, step=step) self._iter = iter_result_proxy(result_proxy, step=step)
except ResourceClosedError:
self.keys = []
self._iter = iter([])
def __next__(self): def __next__(self):
try: try: