p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Adrian Holovaty 2005-12-30 15:51:53 +00:00
parent a22a7ff4d0
commit 9d5272d61d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/utils/datastructures.py
View File

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

6
tests/othertests/httpwrappers.py
View File

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