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

Backport of aabb584 from master
django · Jun 30, 2015 · 9bd3a23 · 9bd3a23
1 parent 1efda84
commit 9bd3a23
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/django/apps/registry.py b/django/apps/registry.py
@@ -213,7 +213,7 @@ def register_model(self, app_label, model):
                 warnings.warn(
                     "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),
+                    "most notably with related models." % (app_label, model_name),
                     RuntimeWarning, stacklevel=2)
             else:
                 raise RuntimeError(

diff --git a/tests/apps/tests.py b/tests/apps/tests.py
@@ -235,7 +235,7 @@ def test_model_clash(self):
             self.assertEqual(len(w), 1)
             self.assertTrue(issubclass(w[-1].category, RuntimeWarning))
             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, "
                  "most notably with related models.")