From dbd1cb9083db8a0206a4b951813f4c8291afa824 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 22 Oct 2007 00:52:54 +0000 Subject: Fixed #5183 -- Added __deepcopy__, pop() and popitem() to SortedDict. Based on a patch from David Blewett. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6593 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/datastructures.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'django/utils') diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py index dfd3fc69e7..e0835b2cfc 100644 --- a/django/utils/datastructures.py +++ b/django/utils/datastructures.py @@ -62,6 +62,13 @@ class SortedDict(dict): else: self.keyOrder = [key for key, value in data] + def __deepcopy__(self,memo): + from copy import deepcopy + obj = self.__class__() + for k, v in self.items(): + obj[k] = deepcopy(v, memo) + return obj + def __setitem__(self, key, value): dict.__setitem__(self, key, value) if key not in self.keyOrder: @@ -75,6 +82,20 @@ class SortedDict(dict): for k in self.keyOrder: yield k + def pop(self, k, *args): + result = dict.pop(self, k, *args) + try: + self.keyOrder.remove(k) + except ValueError: + # Key wasn't in the dictionary in the first place. No problem. + pass + return result + + def popitem(self): + result = dict.popitem(self) + self.keyOrder.remove(result[0]) + return result + def items(self): return zip(self.keyOrder, self.values()) -- cgit v1.3