Ticket #1437: enable_models_outside_models_py.diff

django/db/models/base.py

@@ -25 +25 @@
             return type.__new__(cls, name, bases, attrs)
 
         mod = attrs.pop('__module__')
+        meta = attrs.pop('Meta', None)
+        if meta is not None:
+            # Allow module to be overridden using Meta
+            mod = getattr(meta, 'module', mod)
 
         # Raise ImportError if this model isn't in INSTALLED_APPS.
         if re.sub('\.models$', '', mod) not in settings.INSTALLED_APPS:
@@ -32 +36 @@
 
         # Create the class.
         new_class = type.__new__(cls, name, bases, {'__module__': mod})
-        new_class.add_to_class('_meta', Options(attrs.pop('Meta', None)))
+        new_class.add_to_class('_meta', Options(meta))
         new_class.add_to_class('DoesNotExist', types.ClassType('DoesNotExist', (ObjectDoesNotExist,), {}))
 
         # Build complete list of parents

django/db/models/options.py

@@ -12 +12 @@
 
 DEFAULT_NAMES = ('verbose_name', 'verbose_name_plural', 'db_table', 'ordering',
                  'unique_together', 'permissions', 'get_latest_by',
-                 'order_with_respect_to', 'app_label')
+                 'order_with_respect_to', 'app_label', 'module')
 
 class Options:
     def __init__(self, meta):
@@ -24 +24 @@
         self.unique_together =  []
         self.permissions =  []
         self.object_name, self.app_label = None, None
+        self.module = None
         self.get_latest_by = None
         self.order_with_respect_to = None
         self.admin = None