Rename popitem() to pop(). (An idea from SF patch 597444.)

diff --git a/Lib/sets.py b/Lib/sets.py
index c301c4183be48ff009f5f2c28d32a543c4727747..05128462ecf265175b343f9cd30cac8394285af1 100644 (file)
--- a/Lib/sets.py
+++ b/Lib/sets.py
@@ -420,7 +420,7 @@ class Set(BaseSet):
         except KeyError:
             pass
 
-    def popitem(self):
+    def pop(self):
         """Remove and return a randomly-chosen set element."""
         return self._data.popitem()[0]
 

diff --git a/Lib/test/test_sets.py b/Lib/test/test_sets.py
index 6c72b0e9bc2508d385d7f01c5de7c6fd834da504..22a9db519abfacc82cd92b802152f18c2fa1953b 100644 (file)
--- a/Lib/test/test_sets.py
+++ b/Lib/test/test_sets.py
@@ -292,10 +292,10 @@ class TestMutate(unittest.TestCase):
         self.set.clear()
         assert len(self.set) == 0, "Clearing set"
 
-    def test_popitem(self):
+    def test_pop(self):
         popped = {}
         while self.set:
-            popped[self.set.popitem()] = None
+            popped[self.set.pop()] = None
         assert len(popped) == len(self.values), "Popping items"
         for v in self.values:
             assert v in popped, "Popping items"