Ticket #12012: 12012-r11620.diff

django/conf/__init__.py

@@ -85 +85 @@
                     setting_value = (setting_value,) # In case the user forgot the comma.
                 setattr(self, setting, setting_value)
 
+        if hasattr(self, 'BOOTSTRAP_CALLBACKS'):
+            try:
+                callbacks = self.BOOTSTRAP_CALLBACKS
+                for callback in callbacks:
+                    try:
+                        callback()
+                    except Exception:
+                        raise # TODO handle error in callback
+            except TypeError:
+                raise # TODO handle non-iterable
+
         # Expand entries in INSTALLED_APPS like "django.contrib.*" to a list
         # of all those apps.
         new_installed_apps = []

django/db/models/loading.py

@@ -52 +52 @@
         try:
             if self.loaded:
                 return
+
+            if hasattr(settings, 'PRE_MODEL_CALLBACKS'):
+                callbacks = settings.PRE_MODEL_CALLBACKS
+                for callback in callbacks:
+                    callback()
+
             for app_name in settings.INSTALLED_APPS:
                 if app_name in self.handled:
                     continue