diff options
| author | Jason Kirtland <jek@discorporate.us> | 2008-07-10 19:16:08 +0000 |
|---|---|---|
| committer | Jason Kirtland <jek@discorporate.us> | 2008-07-10 19:16:08 +0000 |
| commit | 8b6855fc2c833e0ac626718cd08cd08beb947899 (patch) | |
| tree | 54030c18792bc5bc5d86214d691bffd6ed7581a4 /lib/sqlalchemy/util.py | |
| parent | f299d9ea0403f8407048552441ee9eed4ac38aa0 (diff) | |
| download | sqlalchemy-8b6855fc2c833e0ac626718cd08cd08beb947899.tar.gz | |
Added default support to OrderedDict.pop [ticket:585]
Diffstat (limited to 'lib/sqlalchemy/util.py')
| -rw-r--r-- | lib/sqlalchemy/util.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py index dea320724..c9982a9fa 100644 --- a/lib/sqlalchemy/util.py +++ b/lib/sqlalchemy/util.py @@ -759,9 +759,11 @@ class OrderedDict(dict): dict.__delitem__(self, key) self._list.remove(key) - def pop(self, key): - value = dict.pop(self, key) - self._list.remove(key) + def pop(self, key, *default): + present = key in self + value = dict.pop(self, key, *default) + if present: + self._list.remove(key) return value def popitem(self): |