Ticket #8108: 8108.diff

django/db/models/base.py

@@ -11 +11 @@
 import django.db.models.manipulators    # Imported to register signal handler.
 import django.db.models.manager         # Ditto.
 from django.core import validators
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, FieldError, ImproperlyConfigured
 from django.db.models.fields import AutoField, ImageField
 from django.db.models.fields.related import OneToOneRel, ManyToOneRel, OneToOneField
 from django.db.models.query import delete_objects, Q, CollectedObjects
@@ -53 +53 @@
             # 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]}
+            try:
+                app_label = model_module.__name__.split('.')[-2]
+            except IndexError:
+                if abstract:
+                    app_label = '_abstract'
+                else:
+                    raise ImproperlyConfigured, \
+                        "Model definitions in '%s' module must reside in an app-level subdirectory within your project or have a defined app_label" \
+                        % (model_module.__name__)
+            kwargs = {"app_label": app_label}
         else:
             kwargs = {}