p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.6.x] Fixed #15625 -- Made message in MultiValueDictKeyError less verbose. 

Thanks margieroginski for the suggestion.

Backport of 893198509e from master
This commit is contained in:
Tim Graham 2013-09-16 16:20:29 -04:00
parent 325b03ea84
commit 275497c570
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/utils/datastructures.py
View File

@ -298,7 +298,7 @@ class MultiValueDict(dict):
try: try:
list_ = super(MultiValueDict, self).__getitem__(key) list_ = super(MultiValueDict, self).__getitem__(key)
except KeyError: except KeyError:
raise MultiValueDictKeyError("Key %r not found in %r" % (key, self)) raise MultiValueDictKeyError(repr(key))
try: try:
return list_[-1] return list_[-1]
except IndexError: except IndexError:

6
tests/utils_tests/test_datastructures.py
View File

@ -234,11 +234,7 @@ class MultiValueDictTests(SimpleTestCase):
[('name', ['Adrian', 'Simon']), [('name', ['Adrian', 'Simon']),
('position', ['Developer'])]) ('position', ['Developer'])])
# MultiValueDictKeyError: "Key 'lastname' not found in six.assertRaisesRegex(self, MultiValueDictKeyError, 'lastname',
# <MultiValueDict: {'position': ['Developer'],
# 'name': ['Adrian', 'Simon']}>"
six.assertRaisesRegex(self, MultiValueDictKeyError,
r'"Key \'lastname\' not found in <MultiValueDict',
d.__getitem__, 'lastname') d.__getitem__, 'lastname')
self.assertEqual(d.get('lastname'), None) self.assertEqual(d.get('lastname'), None)