Ticket #13903: 0001-Fixes-13903.diff

django/db/models/base.py

@@ -48 +48 @@
             # Figure out the app_label by looking one level up.
             # For 'django.contrib.sites.models', this would be 'sites'.
             model_module = sys.modules[new_class.__module__]
-            kwargs = {"app_label": model_module.__name__.split('.')[-2]}
+            kwargs = {"app_label": get_appname_for_module(model_module)}
         else:
             kwargs = {}
 
@@ -914 +914 @@
 else:
     def subclass_exception(name, parents, module):
         return type(name, parents, {'__module__': module})
+
+def get_appname_for_module(module):
+    """
+    Used to calculate appname for a given module
+    """
+    module_name = module.__name__
+    namespace = module_name.split('.')
+
+    if len(namespace) == 1:
+        return namespace[0]
+    else:
+        return namespace[-2]
+ No newline at end of file

new file tests/modeltests/auto_app_label/app/models.py

@@ +1 @@
+# coding: utf-8
+from django.db import models
+
+
+class ModelAtNormalLevel(models.Model):
+    pass

new file tests/modeltests/auto_app_label/app_package/models/__init__.py

@@ +1 @@
+# coding: utf-8
+from django.db import models
+
+
+class ModelAtPackageLevel(models.Model):
+    pass

new file tests/modeltests/auto_app_label/app_parent/models.py

@@ +1 @@
+from parentmodel import ModelAtParentLevel
+

new file tests/modeltests/auto_app_label/parentmodel.py

@@ +1 @@
+from django.db import models
+
+
+class ModelAtParentLevel(models.Model):
+    pass

new file tests/modeltests/auto_app_label/tests.py

@@ +1 @@
+# coding: utf-8
+import sys, os
+from django.conf import settings
+from django.core.management import call_command
+from django.db.models.loading import load_app, get_model, cache
+from django.test import TransactionTestCase
+
+
+class AutoAppLabelTest(TransactionTestCase):
+
+    def setUp(self):
+        self.old_sys_path = sys.path[:]
+        self.old_installed_apps = settings.INSTALLED_APPS
+
+        sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+        settings.INSTALLED_APPS = ('app', 'app_package', 'app_parent')
+        map(load_app, settings.INSTALLED_APPS)
+        call_command('syncdb', verbosity=0)
+
+    def tearDown(self):
+        settings.INSTALLED_APPS = self.old_installed_apps
+        sys.path = self.old_sys_path
+
+    def test_model_at_normal_level(self):
+        self.assertTrue(get_model('app', 'modelatnormallevel'))
+
+    def test_model_at_package_level(self):
+        self.assertTrue(get_model('app_package', 'modelatpackagelevel'))
+
+    def test_model_at_parent_module(self):
+        self.assertTrue(get_model('parentmodel', 'modelatparentlevel'))