summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorpgjones <philip.graham.jones@googlemail.com>2015-10-30 20:20:58 +0000
committerpgjones <philip.graham.jones@googlemail.com>2015-10-30 20:20:58 +0000
commit6ab120558078bdcbfbe06d2ca55bd7a0d417bbb4 (patch)
tree9b51224766e3f5faab2d9e313f704187b01edde0 /lib/sqlalchemy/engine
parent98c1dcc6bcade313a254fe11e8efa3c5b5ad959e (diff)
downloadsqlalchemy-pr/211.tar.gz
Change generator termination from StopIteration to return.pr/211
From [PEP 479](https://www.python.org/dev/peps/pep-0479/) the correct way to terminate a generator is to return (which implicitly raises StopIteration) rather than raise StopIteration. Without this change using sqlalchemy in python 3.5 or greater results in these warnings PendingDeprecationWarning: generator '__iter__' raised StopIteration which this commit should remove.
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/result.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 74a0fce77..7d1425c28 100644
--- a/lib/sqlalchemy/engine/result.py
+++ b/lib/sqlalchemy/engine/result.py
@@ -712,7 +712,7 @@ class ResultProxy(object):
while True:
row = self.fetchone()
if row is None:
- raise StopIteration
+ return
else:
yield row