Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.8.x] Refs #23621 -- Fixed warning message when reloading models.

Browse Source 
Backport of aabb58428beae0bd34f32e5d620a82486b670499 from master
This commit is contained in:
Marten Kenbeek 2015-06-30 20:38:07 +02:00 committed by Tim Graham
parent fdaf9359ab
commit 42aa919de9
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

@ -213,7 +213,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

@ -234,7 +234,7 @@ class AppsTests(TestCase):
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.")