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

Refs #23621 -- Fixed warning message when reloading models.

This commit is contained in:
Marten Kenbeek 2015-06-30 20:38:07 +02:00 committed by Tim Graham
parent 00a1d4d042
commit aabb58428b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/apps/registry.py
View File

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

2
tests/apps/tests.py
View File

@ -237,7 +237,7 @@ class AppsTests(SimpleTestCase):
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), self.assertEqual(str(w[-1].message),
"Model 'southponies.apps' was already registered. " "Model 'apps.southponies' was already registered. "
"Reloading models is not advised as it can lead to inconsistencies, " "Reloading models is not advised as it can lead to inconsistencies, "
"most notably with related models.") "most notably with related models.")