diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-03-04 19:20:34 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-03-04 19:20:34 (GMT) |
commit | de89d4b09758a1c94dd97be554c967d52759228a (patch) | |
tree | af59ad4840f810d7d48186eafd72ec2e0c89c657 /Lib | |
parent | 4a90ef03637fdc1bc63ee9be82fbf22cbaa68662 (diff) | |
download | cpython-de89d4b09758a1c94dd97be554c967d52759228a.zip cpython-de89d4b09758a1c94dd97be554c967d52759228a.tar.gz cpython-de89d4b09758a1c94dd97be554c967d52759228a.tar.bz2 |
Port 2.7 fix for sporadic failure in test_weakset.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/_weakrefset.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/_weakrefset.py b/Lib/_weakrefset.py index f34aa86..c2717e7 100644 --- a/Lib/_weakrefset.py +++ b/Lib/_weakrefset.py @@ -114,11 +114,8 @@ class WeakSet: def update(self, other): if self._pending_removals: self._commit_removals() - if isinstance(other, self.__class__): - self.data.update(other.data) - else: - for element in other: - self.add(element) + for element in other: + self.add(element) def __ior__(self, other): self.update(other) |