commit a3e1e4cd79abe7069c8bc20db65161dd8c68b305
author Raymond Hettinger <python@rcn.com> Thu Mar 06 23:54:28 2003 +0000
committer Raymond Hettinger <python@rcn.com> Thu Mar 06 23:54:28 2003 +0000
tree 18ff4fb0f06cc1a684da8ad62ce21a5b14c1a33c
parent 2b4821347f00b01746562d58390a213924f2b102

SF patch #693753:  fix for bug 639806: default for dict.pop
(contributed by Michael Stone.)

Lib/test/test_userdict.py

diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py
index d3e8002..cb98308 100644
--- a/Lib/test/test_userdict.py
+++ b/Lib/test/test_userdict.py
@@ -139,6 +139,9 @@
         t = UserDict.UserDict(x=42)
         self.assertEqual(t.pop("x"), 42)
         self.assertRaises(KeyError, t.pop, "x")
+        self.assertEqual(t.pop("x", 1), 1)
+        t["x"] = 42
+        self.assertEqual(t.pop("x", 1), 42)
 
         # Test popitem
         t = UserDict.UserDict(x=42)
@@ -242,6 +245,9 @@
         self.assertEqual(s.pop(10), 'ten')
         self.assert_(10 not in s)
         s[10] = 'ten'
+        self.assertEqual(s.pop("x", 1), 1)
+        s["x"] = 42
+        self.assertEqual(s.pop("x", 1), 42)
 
         # popitem
         k, v = s.popitem()