summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2003-11-19 15:52:14 (GMT)
committerRaymond Hettinger <python@rcn.com>2003-11-19 15:52:14 (GMT)
commit70b9f499a32f30397e7f1fc97e98f008bc533af0 (patch)
tree7e8f62d55893796ab559112bfe91ec229f4cccca
parent37249c55248d8e355e3184d597f89aace42798ab (diff)
downloadcpython-70b9f499a32f30397e7f1fc97e98f008bc533af0.zip
cpython-70b9f499a32f30397e7f1fc97e98f008bc533af0.tar.gz
cpython-70b9f499a32f30397e7f1fc97e98f008bc533af0.tar.bz2
Remove deprecation of sets.Set.update().
-rw-r--r--Lib/sets.py4
-rw-r--r--Misc/NEWS3
2 files changed, 1 insertions, 6 deletions
diff --git a/Lib/sets.py b/Lib/sets.py
index 6e09005..8ec7e2f 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 ecc242a..191ef48 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