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

Improved warning message when reloading models. Refs #23621. 

Thanks dfunckt and Tim Graham.
This commit is contained in:
Loic Bistuer 2014-10-23 01:28:57 +07:00
parent 8c4ca16c65
commit b62f72498a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/apps/registry.py
View File

@ -211,7 +211,9 @@ class Apps(object):
if (model.__name__ == app_models[model_name].__name__ and if (model.__name__ == app_models[model_name].__name__ and
model.__module__ == app_models[model_name].__module__): model.__module__ == app_models[model_name].__module__):
warnings.warn( warnings.warn(
"Model '%s.%s' was already registered." % (model_name, app_label), "Model '%s.%s' was already registered. "
"Reloading models is not advised as it can lead to inconsistencies, "
"most notably with related models." % (model_name, app_label),
RuntimeWarning, stacklevel=2) RuntimeWarning, stacklevel=2)
else: else:
raise RuntimeError( raise RuntimeError(

5
tests/apps/tests.py
View File

@ -234,7 +234,10 @@ class AppsTests(TestCase):
type(str("SouthPonies"), (models.Model,), body) type(str("SouthPonies"), (models.Model,), body)
self.assertEqual(len(w), 1) self.assertEqual(len(w), 1)
self.assertTrue(issubclass(w[-1].category, RuntimeWarning)) self.assertTrue(issubclass(w[-1].category, RuntimeWarning))
self.assertEqual(str(w[-1].message), "Model 'southponies.apps' was already registered.") self.assertEqual(str(w[-1].message),
"Model 'southponies.apps' was already registered. "
"Reloading models is not advised as it can lead to inconsistencies, "
"most notably with related models.")
# If it doesn't appear to be a reloaded module then we expect # If it doesn't appear to be a reloaded module then we expect
# a RuntimeError. # a RuntimeError.