Ticket #1821: app_label.diff

django/db/models/base.py

@@ -40 +40 @@
         model_module = sys.modules[new_class.__module__]
 
         if getattr(new_class._meta, 'app_label', None) is None:
-            # Figure out the app_label by looking one level up.
-            # For 'django.contrib.sites.models', this would be 'sites'.
-            new_class._meta.app_label = model_module.__name__.split('.')[-2]
+            # Perhaps there's a module attribute?
+            try:
+                new_class._meta.app_label = model_module.app_label
+            except AttributeError:
+                # Figure out the app_label by looking one level up.
+                # For 'django.contrib.sites.models', this would be 'sites'.
+                try:
+                    new_class._meta.app_label = model_module.__name__.split('.')[-2]
+                except IndexError:
+                    raise IndexError, _(
+"""Interactive model use not directly supported.
+To circumvent this restriction, add an app_label attribute to each model class or to
+the model module.""")
 
         # Add all attributes to the class.
         for obj_name, obj in attrs.items():