Changeset 4640

Timestamp:

02/27/07 18:35:50 (2 years ago)

Author:

jacob

Message:

Fixed #2779: added a copy() method to MergeDict?, along with some new tests for django.utils.datastructures. Thanks, Chris McAvoy?.

Files:

• django/trunk/django/utils/datastructures.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/datastructures (added)
• django/trunk/tests/regressiontests/datastructures/__init__.py (added)
• django/trunk/tests/regressiontests/datastructures/models.py (added)
• django/trunk/tests/regressiontests/datastructures/tests.py (added)

django/trunk/django/utils/datastructures.py

@@ -17 +17 @@
-    def __contains__(self, key):
-        return self.has_key(key)
+        
+    def __copy__(self): 
+        return self.__class__(*self.dicts) 
-
-    def get(self, key, default=None):
@@ -43 +46 @@
-                return True
-        return False
+        
+    def copy(self): 
+        """ returns a copy of this object""" 
+        return self.__copy__()
-
-class SortedDict(dict):