magic-removal: Fixed #1141 -- Fixed unit-test failures in [1799]. Thanks, Russ

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1801 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/utils/datastructures.py

@@ -74,7 +74,7 @@ class MultiValueDict(dict):
         try:
             list_ = dict.__getitem__(self, key)
         except KeyError:
-            raise MultiValueDictKeyError, "Key %r not found in MultiValueDict %r" % (key, self)
+            raise MultiValueDictKeyError, "Key %r not found in %r" % (key, self)
         try:
             return list_[-1]
         except IndexError:
@@ -189,10 +189,10 @@ class DotExpandedDict(dict):
                 current[bits[-1]] = v
             except TypeError: # Special-case if current isn't a dict.
                 current = {bits[-1] : v}
-                
-def dot_expand(key_to_list_mapping, dict_factory=dict):                
+
+def dot_expand(key_to_list_mapping, dict_factory=dict):
     top = dict_factory()
-    
+
     for k, v in key_to_list_mapping.items():
         current = top
         bits = k.split('.')
@@ -203,4 +203,4 @@ def dot_expand(key_to_list_mapping, dict_factory=dict):
             current[bits[-1]] = v
         except TypeError: # Special-case if current isn't a dict.
             current = dict_factory( (bits[-1], v) )
-    return top    
+    return top

tests/othertests/httpwrappers.py

@@ -8,7 +8,7 @@
 >>> q['foo']
 Traceback (most recent call last):
 ...
-MultiValueDictKeyError: "Key 'foo' not found in MultiValueDict {}"
+MultiValueDictKeyError: "Key 'foo' not found in <MultiValueDict: {}>"
 
 >>> q['something'] = 'bar'
 Traceback (most recent call last):
@@ -86,7 +86,7 @@ AttributeError: This QueryDict instance is immutable
 >>> q['foo']
 Traceback (most recent call last):
 ...
-MultiValueDictKeyError: "Key 'foo' not found in MultiValueDict {}"
+MultiValueDictKeyError: "Key 'foo' not found in <MultiValueDict: {}>"
 
 >>> q['name'] = 'john'
 
@@ -186,7 +186,7 @@ True
 >>> q['bar']
 Traceback (most recent call last):
 ...
-MultiValueDictKeyError: "Key 'bar' not found in MultiValueDict {'foo': ['bar']}"
+MultiValueDictKeyError: "Key 'bar' not found in <MultiValueDict: {'foo': ['bar']}>"
 
 >>> q['something'] = 'bar'
 Traceback (most recent call last):