From 2c9e84af4a08096c47ebd3d54b463af1a3c7de77 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 12 Dec 2013 11:36:40 +0100 Subject: [PATCH] Removed unused attribute app_errors of the app cache. get_app_errors() always returned an empty dictionary; this behavior is preserved in django.db.models.loading until that module is deprecated. --- django/apps/cache.py | 8 -------- django/core/management/validation.py | 3 --- django/db/models/loading.py | 12 +++++++++++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/django/apps/cache.py b/django/apps/cache.py index 3ef63eff4a..34909deeac 100644 --- a/django/apps/cache.py +++ b/django/apps/cache.py @@ -35,9 +35,6 @@ def _initialize(): # May contain apps that are not installed. app_models=OrderedDict(), - # Mapping of app_labels to errors raised when trying to import the app. - app_errors={}, - # Pending lookups for lazy relations pending_lookups={}, @@ -223,11 +220,6 @@ class BaseAppCache(object): finally: imp.release_lock() - def get_app_errors(self): - "Returns the map of known problems with the INSTALLED_APPS." - self._populate() - return self.app_errors - def get_models(self, app_mod=None, include_auto_created=False, include_deferred=False, only_installed=True, include_swapped=False): diff --git a/django/core/management/validation.py b/django/core/management/validation.py index 89aa5ad068..2b27a7edce 100644 --- a/django/core/management/validation.py +++ b/django/core/management/validation.py @@ -32,9 +32,6 @@ def get_validation_errors(outfile, app=None): e = ModelErrorCollection(outfile) - for (app_name, error) in app_cache.get_app_errors().items(): - e.add(app_name, error) - for cls in app_cache.get_models(app, include_swapped=True): opts = cls._meta diff --git a/django/db/models/loading.py b/django/db/models/loading.py index 1371a15fdf..f814f949e4 100644 --- a/django/db/models/loading.py +++ b/django/db/models/loading.py @@ -17,9 +17,19 @@ get_app_package = app_cache.get_app_package get_app_path = app_cache.get_app_path get_app_paths = app_cache.get_app_paths get_app = app_cache.get_app -get_app_errors = app_cache.get_app_errors get_models = app_cache.get_models get_model = app_cache.get_model register_models = app_cache.register_models load_app = app_cache.load_app app_cache_ready = app_cache.app_cache_ready + + +# This method doesn't return anything interesting in Django 1.6. Maintain it +# just for backwards compatibility until this module is deprecated. +def get_app_errors(): + try: + return app_cache.app_errors + except AttributeError: + app_cache._populate() + app_cache.app_errors = {} + return app_cache.app_errors