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

Removed the only_installed argument of Apps.get_models.

Browse Source 
Refs #15903, #15866, #15850.
This commit is contained in:
Aymeric Augustin
2013-12-28 18:27:33 +01:00
parent ba7206cd81
commit 9f13c33281
4 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
django/apps/registry.py
View File

@@ -27,10 +27,6 @@ class Apps(object):
if master and hasattr(sys.modules[__name__], 'apps'):
raise RuntimeError("You may create only one master registry.")
# When master is set to False, the registry ignores the only_installed
# arguments to get_model[s].
self.master = master
# Mapping of app labels => model names => model classes. Every time a
# model is imported, ModelBase.__new__ calls apps.register_model which
# creates an entry in all_models. All imported models are registered,
@@ -190,9 +186,8 @@ class Apps(object):
# This method is performance-critical at least for Django's test suite.
@lru_cache.lru_cache(maxsize=None)
def get_models(self, app_mod=None,
include_auto_created=False, include_deferred=False,
only_installed=True, include_swapped=False):
def get_models(self, app_mod=None, include_auto_created=False,
include_deferred=False, include_swapped=False):
"""
Given a module containing models, returns a list of the models.
Otherwise returns a list of all installed models.
@@ -205,33 +200,20 @@ class Apps(object):
queries are *not* included in the list of models. However, if
you specify include_deferred, they will be.
By default, models that aren't part of installed apps will *not*
be included in the list of models. However, if you specify
only_installed=False, they will be. If you're using a non-default
Apps, this argument does nothing - all models will be included.
By default, models that have been swapped out will *not* be
included in the list of models. However, if you specify
include_swapped, they will be.
"""
if not self.master:
only_installed = False
model_list = None
self.populate_models()
if app_mod:
app_label = app_mod.__name__.split('.')[-2]
if only_installed:
try:
model_dicts = [self.app_configs[app_label].models]
except KeyError:
model_dicts = []
else:
model_dicts = [self.all_models[app_label]]
try:
model_dicts = [self.app_configs[app_label].models]
except KeyError:
model_dicts = []
else:
if only_installed:
model_dicts = [app_config.models for app_config in self.app_configs.values()]
else:
model_dicts = self.all_models.values()
model_dicts = [app_config.models for app_config in self.app_configs.values()]
model_list = []
for model_dict in model_dicts:
model_list.extend(

4
django/db/models/options.py
View File

@@ -514,7 +514,7 @@ class Options(object):
cache[obj] = model
# Collect also objects which are in relation to some proxy child/parent of self.
proxy_cache = cache.copy()
for klass in self.apps.get_models(include_auto_created=True, only_installed=False):
for klass in self.apps.get_models(include_auto_created=True):
if not klass._meta.swapped:
for f in klass._meta.local_fields:
if f.rel and not isinstance(f.rel.to, six.string_types) and f.generate_reverse_relation:
@@ -557,7 +557,7 @@ class Options(object):
cache[obj] = parent
else:
cache[obj] = model
for klass in self.apps.get_models(only_installed=False):
for klass in self.apps.get_models():
if not klass._meta.swapped:
for f in klass._meta.local_many_to_many:
if (f.rel