innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed incorrect error message in Options.get_fields()

This commit is contained in:
Collin Anderson 2015-01-14 13:40:31 -05:00 committed by Tim Graham
parent 28308078f3
commit 2d5da57f48
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/options.py
View File

@ -535,8 +535,8 @@ class Options(object):
# unavailable, therefore we throw a FieldDoesNotExist exception. # unavailable, therefore we throw a FieldDoesNotExist exception.
if not self.apps.ready: if not self.apps.ready:
raise FieldDoesNotExist( raise FieldDoesNotExist(
"%s has no field named %r. The app cache isn't " "%s has no field named %r. The app cache isn't ready yet, "
"ready yet, so if this is a forward field, it won't " "so if this is an auto-created related field, it won't "
"be available yet." % (self.object_name, field_name) "be available yet." % (self.object_name, field_name)
) )

6
tests/model_meta/tests.py
View File

@ -169,7 +169,7 @@ class GetFieldByNameTests(OptionsBaseTests):
self.assertEqual(field_info[1:], (None, True, False)) self.assertEqual(field_info[1:], (None, True, False))
self.assertIsInstance(field_info[0], GenericRelation) self.assertIsInstance(field_info[0], GenericRelation)
def test_get_fields_only_searaches_forward_on_apps_not_ready(self): def test_get_fields_only_searches_forward_on_apps_not_ready(self):
opts = Person._meta opts = Person._meta
# If apps registry is not ready, get_field() searches over only # If apps registry is not ready, get_field() searches over only
# forward fields. # forward fields.
@ -179,8 +179,8 @@ class GetFieldByNameTests(OptionsBaseTests):
self.assertTrue(opts.get_field('data_abstract')) self.assertTrue(opts.get_field('data_abstract'))
msg = ( msg = (
"Person has no field named 'relating_baseperson'. The app " "Person has no field named 'relating_baseperson'. The app "
"cache isn't ready yet, so if this is a forward field, it " "cache isn't ready yet, so if this is an auto-created related "
"won't be available yet." "field, it won't be available yet."
) )
# 'data_abstract' is a reverse field, and will raise an exception # 'data_abstract' is a reverse field, and will raise an exception
with self.assertRaisesMessage(FieldDoesNotExist, msg): with self.assertRaisesMessage(FieldDoesNotExist, msg):