diff options
| author | Carson Ip <carsonip715@gmail.com> | 2019-12-27 12:05:30 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-12-27 14:37:41 -0500 |
| commit | f7a7af70c4f6f07011fa2d521fb1560917896427 (patch) | |
| tree | 69c7c601d7e3b69f0b7563ca3a335272f030c1b8 /lib/sqlalchemy | |
| parent | 60e7034a7423955cd89d5624f8769d3804ca6d82 (diff) | |
| download | sqlalchemy-f7a7af70c4f6f07011fa2d521fb1560917896427.tar.gz | |
Fix WeakSequence circular reference
Fixed a reference cycle which could impact the GC behavior of the
:class:`.WeakSequence` object, currently used within one place in certain
mapper configurations. The issue only affects configuration-time
structures. Pull request courtesy Carson Ip.
Fixes: #5050
Closes: #5051
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5051
Pull-request-sha: db672f45f4f139722edd2dcc6b0c19892725c9de
Change-Id: I72673a33e655c44b68283ec1a2d7358b904e90ae
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/util/_collections.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py index 75e1727df..04409cfd9 100644 --- a/lib/sqlalchemy/util/_collections.py +++ b/lib/sqlalchemy/util/_collections.py @@ -676,16 +676,18 @@ class IdentitySet(object): class WeakSequence(object): def __init__(self, __elements=()): + def _remove(item, selfref=weakref.ref(self)): + self = selfref() + if self is not None: + self._storage.remove(item) + self._remove = _remove self._storage = [ - weakref.ref(element, self._remove) for element in __elements + weakref.ref(element, _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) |