diff options
| author | pgjones <philip.graham.jones@googlemail.com> | 2015-10-30 20:20:58 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-11-30 12:35:35 -0500 |
| commit | 735fb9295433fb2d42e3e47949eb59a08fec6f90 (patch) | |
| tree | b76c38d3ce7cc5ac5756bef4a9cf65d131b3d061 /lib/sqlalchemy/ext/associationproxy.py | |
| parent | 730aa2140c96459e4b96f21d7c36b234fff9f39d (diff) | |
| download | sqlalchemy-735fb9295433fb2d42e3e47949eb59a08fec6f90.tar.gz | |
Change generator termination from StopIteration to return.
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.
(cherry picked from commit 6ab120558078bdcbfbe06d2ca55bd7a0d417bbb4)
Diffstat (limited to 'lib/sqlalchemy/ext/associationproxy.py')
| -rw-r--r-- | lib/sqlalchemy/ext/associationproxy.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py index 29064ef27..31f16287d 100644 --- a/lib/sqlalchemy/ext/associationproxy.py +++ b/lib/sqlalchemy/ext/associationproxy.py @@ -603,7 +603,7 @@ class _AssociationList(_AssociationCollection): for member in self.col: yield self._get(member) - raise StopIteration + return def append(self, value): item = self._create(value) @@ -907,7 +907,7 @@ class _AssociationSet(_AssociationCollection): """ for member in self.col: yield self._get(member) - raise StopIteration + return def add(self, value): if value not in self: |