newforms-admin: Merged from trunk up to [6670]. This is just before auto-escaping was checked in.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6761 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 5 deletions

diff --git a/django/utils/datastructures.py b/django/utils/datastructures.py
index e0835b2cfc..549aa3f183 100644
--- a/django/utils/datastructures.py
+++ b/django/utils/datastructures.py
@@ -62,12 +62,10 @@ class SortedDict(dict):
         else:
             self.keyOrder = [key for key, value in data]
 
-    def __deepcopy__(self,memo):
+    def __deepcopy__(self, memo):
         from copy import deepcopy
-        obj = self.__class__()
-        for k, v in self.items():
-            obj[k] = deepcopy(v, memo)
-        return obj
+        return self.__class__([(key, deepcopy(value, memo))
+                               for key, value in self.iteritems()])
 
     def __setitem__(self, key, value):
         dict.__setitem__(self, key, value)