summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-08-18 16:05:38 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-08-18 16:06:08 -0400
commitef73845ba773cbf4247355cde37aff8ca3b9f5f8 (patch)
treea0824a7af0abced5e399705c5d7cadeb45d0d65e /lib
parent6028f8234549ad7bd4377a3408c4b869b05796a9 (diff)
downloadsqlalchemy-ef73845ba773cbf4247355cde37aff8ca3b9f5f8.tar.gz
- add WeakSequence.append()
- fix and test weakref cleanout for WeakSequence, [ticket:2794]
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/util/_collections.py13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index b2f03450d..90d9f91f9 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -617,16 +617,23 @@ class IdentitySet(object):
class WeakSequence(object):
- def __init__(self, elements):
+ def __init__(self, __elements=()):
self._storage = [
- weakref.ref(element) for element in elements
+ weakref.ref(element, self._remove) for element in __elements
]
+ def append(self, item):
+ self._storage.append(weakref.ref(item, self._remove))
+
def _remove(self, ref):
self._storage.remove(ref)
+ def __len__(self):
+ return len(self._storage)
+
def __iter__(self):
- return (obj for obj in (ref() for ref in self._storage) if obj is not None)
+ return (obj for obj in
+ (ref() for ref in self._storage) if obj is not None)
def __getitem__(self, index):
try: