diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-18 15:36:26 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-18 15:36:26 -0400 |
| commit | 17274222f1bd3b844faea4d848756ae3ee3545dd (patch) | |
| tree | 74f569c689d7095381d68b9e3eb74f00ad52cf13 | |
| parent | 4b1ca23027493d8d1b7ea48d4585699b0d126d16 (diff) | |
| download | sqlalchemy-17274222f1bd3b844faea4d848756ae3ee3545dd.tar.gz | |
fix the merge
| -rw-r--r-- | lib/sqlalchemy/util/_collections.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py index 4da13b3fe..b2f03450d 100644 --- a/lib/sqlalchemy/util/_collections.py +++ b/lib/sqlalchemy/util/_collections.py @@ -626,11 +626,7 @@ class WeakSequence(object): self._storage.remove(ref) def __iter__(self): -<<<<<<< HEAD - return self._storage.itervalues() -======= return (obj for obj in (ref() for ref in self._storage) if obj is not None) ->>>>>>> 676876f... Fixed a potential issue in an ordered sequence implementation used def __getitem__(self, index): try: |