mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Populated Apps instances immediately by default.

Browse Source
This commit is contained in:
Aymeric Augustin
2013-12-30 16:03:06 +01:00
parent c31d7c4813
commit 7ed20e0153
5 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
django/apps/registry.py
View File

@@ -19,11 +19,12 @@ class Apps(object):
It also keeps track of models eg. to provide reverse-relations.
"""
def __init__(self, master=False):
# Only one master registry may exist at a given time, and it shall be
# the apps variable defined at the end of this module.
if master and hasattr(sys.modules[__name__], 'apps'):
raise RuntimeError("You may create only one master registry.")
def __init__(self, installed_apps=()):
# installed_apps is set to None when creating the master registry
# because it cannot be populated at that point. Other registries must
# provide a list of installed apps and are populated immediately.
if installed_apps is None and hasattr(sys.modules[__name__], 'apps'):
raise RuntimeError("You must supply an installed_apps argument.")
# Mapping of app labels => model names => model classes. Every time a
# model is imported, ModelBase.__new__ calls apps.register_model which
@@ -48,6 +49,11 @@ class Apps(object):
# Pending lookups for lazy relations.
self._pending_lookups = {}
# Populate apps and models, unless it's the master registry.
if installed_apps is not None:
self.populate_apps(installed_apps)
self.populate_models()
def populate_apps(self, installed_apps=None):
"""
Populate app-related information.
@@ -442,4 +448,4 @@ class Apps(object):
self.register_model(app_label, model)
apps = Apps(master=True)
apps = Apps(installed_apps=None)

5
django/db/migrations/state.py
View File

@@ -33,12 +33,9 @@ class ProjectState(object):
def render(self):
"Turns the project state into actual models in a new Apps"
if self.apps is None:
self.apps = Apps()
# Populate the app registry with a stub for each application.
app_labels = set(model_state.app_label for model_state in self.models.values())
app_configs = [AppConfigStub(label) for label in sorted(app_labels)]
self.apps.populate_apps(app_configs)
self.apps.populate_models()
self.apps = Apps([AppConfigStub(label) for label in sorted(app_labels)])
# We keep trying to render the models in a loop, ignoring invalid
# base errors, until the size of the unrendered models doesn't
# decrease by at least one, meaning there's a base dependency loop/