From c9196bc88d4ed6bd808635fe7f64893cdb3cc704 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 20 Aug 2002 21:51:59 +0000 Subject: [PATCH] Rename popitem() to pop(). (An idea from SF patch 597444.) --- Lib/sets.py | 2 +- Lib/test/test_sets.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/sets.py b/Lib/sets.py index c301c4183b..05128462ec 100644 --- 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 6c72b0e9bc..22a9db519a 100644 --- 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" -- 2.50.0