From a3e1e4cd79abe7069c8bc20db65161dd8c68b305 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 6 Mar 2003 23:54:28 +0000 Subject: SF patch #693753: fix for bug 639806: default for dict.pop (contributed by Michael Stone.) --- Lib/UserDict.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Lib/UserDict.py') diff --git a/Lib/UserDict.py b/Lib/UserDict.py index fb9cdd5c25..6b5c9dade6 100644 --- a/Lib/UserDict.py +++ b/Lib/UserDict.py @@ -55,8 +55,8 @@ class UserDict: if not self.has_key(key): self[key] = failobj return self[key] - def pop(self, key): - return self.data.pop(key) + def pop(self, key, *args): + return self.data.pop(key, *args) def popitem(self): return self.data.popitem() def __contains__(self, key): @@ -117,8 +117,16 @@ class DictMixin: except KeyError: self[key] = default return default - def pop(self, key): - value = self[key] + def pop(self, key, *args): + if len(args) > 1: + raise TypeError, "pop expected at most 2 arguments, got "\ + + repr(1 + len(args)) + try: + value = self[key] + except KeyError: + if args: + return args[0] + raise del self[key] return value def popitem(self): -- cgit v1.2.1