Removed the PendingDeprecation warning from sets.py because it adds

little value while introducing incompatability with the version
being bugfixed.

diff --git a/Lib/sets.py b/Lib/sets.py
index bd2868ca4876895d16d1e066d0c790eb5e2b1695..04b56e2fcd6a31b28d1b853608f9c5f503e94589 100644 (file)
--- a/Lib/sets.py
+++ b/Lib/sets.py
@@ -500,10 +500,6 @@ class Set(BaseSet):
 
     def update(self, iterable):
         """Add all values from an iterable (such as a list or file)."""
-        import warnings
-        warnings.warn("The update() method is going to be deprecated; "
-                      "Use union_update() instead.",
-                      PendingDeprecationWarning, 2)
         self._update(iterable)
 
     def clear(self):

diff --git a/Misc/NEWS b/Misc/NEWS
index 7e3ce171253055b1e3f143173582ead05c73a316..42384c763cf4680dcb48da61a4072eedef01024d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -90,8 +90,7 @@ Library
 
 - sets.py now runs under Py2.2.  In addition, the argument restrictions
   for most set methods (but not the operators) have been relaxed to
-  allow any iterable.  Also the Set.update() has been deprecated because
-  it duplicates Set.union_update().
+  allow any iterable.
 
 - Bug #801342:  random.sample() now accepts a Set as a possible argument.
   Previously, it insisted that the population argument be indexable.