commit f7dabd849fdac650317004092894e61e1d7e5046
author Antoine Pitrou <solipsis@pitrou.net> Sun Mar 04 20:59:01 2012 +0100
committer Antoine Pitrou <solipsis@pitrou.net> Sun Mar 04 20:59:01 2012 +0100
tree 73f51d8c2628f2c7cd8e646b16656fae76768c43
parent a14bd00542d2919af835ac89326c8d634b29b3f3
parent 0b2b583ea23a699ecb4f403f7547fbbac21dd2e7

Merge

Lib/_weakrefset.py

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 @@
     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)