diff options
| -rw-r--r-- | django/forms/forms.py | 3 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_forms.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/django/forms/forms.py b/django/forms/forms.py index af7318255f..917987c0be 100644 --- a/django/forms/forms.py +++ b/django/forms/forms.py @@ -142,7 +142,8 @@ class BaseForm(object): try: field = self.fields[name] 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) @property diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py index 051968d14f..b8c5f28d2f 100644 --- a/tests/forms_tests/tests/test_forms.py +++ b/tests/forms_tests/tests/test_forms.py @@ -58,11 +58,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['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" />') - try: + + nonexistenterror = "Key u?'nonexistentfield' not found in 'Person'" + with self.assertRaisesRegexp(KeyError, nonexistenterror): p['nonexistentfield'] self.fail('Attempts to access non-existent fields should fail.') - except KeyError: - pass form_output = [] |