summaryrefslogtreecommitdiff
path: root/django/apps
diff options
context:
space:
mode:
authorAnssi Kääriäinen <anssi.kaariainen@thl.fi>2016-02-02 11:33:09 +0200
committerTim Graham <timograham@gmail.com>2016-04-29 13:06:32 -0400
commit7f51876f99851fdc3fef63aecdfbcffa199c26b9 (patch)
tree9b2fc6cda60771d699c85a5259ba80b120417fcd /django/apps
parentdac075e9103ba961af4f70b4011616daa72985d4 (diff)
Fixed #26207 -- Replaced dynamic classes with non-data descriptors for deferred instance loading.
Diffstat (limited to 'django/apps')
-rw-r--r--django/apps/config.py5
-rw-r--r--django/apps/registry.py6
2 files changed, 3 insertions, 8 deletions
diff --git a/django/apps/config.py b/django/apps/config.py
index 6a0c8d8e57..edd7a48a6f 100644
--- a/django/apps/config.py
+++ b/django/apps/config.py
@@ -165,8 +165,7 @@ class AppConfig(object):
raise LookupError(
"App '%s' doesn't have a '%s' model." % (self.label, model_name))
- def get_models(self, include_auto_created=False,
- include_deferred=False, include_swapped=False):
+ def get_models(self, include_auto_created=False, include_swapped=False):
"""
Returns an iterable of models.
@@ -182,8 +181,6 @@ class AppConfig(object):
"""
self.check_models_ready()
for model in self.models.values():
- if model._deferred and not include_deferred:
- continue
if model._meta.auto_created and not include_auto_created:
continue
if model._meta.swapped and not include_swapped:
diff --git a/django/apps/registry.py b/django/apps/registry.py
index 166e6adb97..7ed6e5d468 100644
--- a/django/apps/registry.py
+++ b/django/apps/registry.py
@@ -156,8 +156,7 @@ 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, include_auto_created=False,
- include_deferred=False, include_swapped=False):
+ def get_models(self, include_auto_created=False, include_swapped=False):
"""
Returns a list of all installed models.
@@ -174,8 +173,7 @@ class Apps(object):
result = []
for app_config in self.app_configs.values():
- result.extend(list(app_config.get_models(
- include_auto_created, include_deferred, include_swapped)))
+ result.extend(list(app_config.get_models(include_auto_created, include_swapped)))
return result
def get_model(self, app_label, model_name=None):