From: Raymond Hettinger <python@rcn.com>
Date: Wed, 19 Nov 2003 15:52:14 +0000 (+0000)
Subject: Remove deprecation of sets.Set.update().
X-Git-Tag: v2.4a1~1242
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70b9f499a32f30397e7f1fc97e98f008bc533af0;p=thirdparty%2FPython%2Fcpython.git

Remove deprecation of sets.Set.update().
---

diff --git a/Lib/sets.py b/Lib/sets.py
index 6e09005ebb25..8ec7e2fa8c50 100644
--- a/Lib/sets.py
+++ b/Lib/sets.py
@@ -504,10 +504,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 deprecated; "
-                      "Use union_update() instead.",
-                      DeprecationWarning, 2)
         self._update(iterable)
 
     def clear(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index ecc242ab7dc9..191ef483c3ca 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -161,8 +161,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.
 
 - _strptime.py now has a behind-the-scenes caching mechanism for the most
   recent TimeRE instance used along with the last five unique directive