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

[1.7.x] Fixed #22570 -- Made Form.__getitem__ KeyError more descriptive. 

Backport of df60db0e78 from master
This commit is contained in:
Ben Davis 2014-05-03 12:02:07 -05:00 committed by Tim Graham
parent 2dd52d0433
commit 549b658241
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/forms/forms.py
View File

@ -142,7 +142,8 @@ class BaseForm(object):
try: try:
field = self.fields[name] field = self.fields[name]
except KeyError: except KeyError:
raise KeyError('Key %r not found in Form' % name) raise KeyError(
"Key %r not found in '%s'" % (name, self.__class__.__name__))
return BoundField(self, field, name) return BoundField(self, field, name)
@property @property

6
tests/forms_tests/tests/test_forms.py
View File

@ -57,11 +57,11 @@ class FormsTestCase(TestCase):
self.assertHTMLEqual(str(p['first_name']), '<input type="text" name="first_name" value="John" id="id_first_name" />') self.assertHTMLEqual(str(p['first_name']), '<input type="text" name="first_name" value="John" id="id_first_name" />')
self.assertHTMLEqual(str(p['last_name']), '<input type="text" name="last_name" value="Lennon" id="id_last_name" />') self.assertHTMLEqual(str(p['last_name']), '<input type="text" name="last_name" value="Lennon" id="id_last_name" />')
self.assertHTMLEqual(str(p['birthday']), '<input type="text" name="birthday" value="1940-10-9" id="id_birthday" />') self.assertHTMLEqual(str(p['birthday']), '<input type="text" name="birthday" value="1940-10-9" id="id_birthday" />')
try:
nonexistenterror = "Key u?'nonexistentfield' not found in 'Person'"
with self.assertRaisesRegexp(KeyError, nonexistenterror):
p['nonexistentfield'] p['nonexistentfield']
self.fail('Attempts to access non-existent fields should fail.') self.fail('Attempts to access non-existent fields should fail.')
except KeyError:
pass
form_output = [] form_output = []