From c74d8424b88c0bffe9a3d18cf09b33ea12ea4551 Mon Sep 17 00:00:00 2001 From: Moritz Pfeiffer Date: Tue, 16 May 2017 14:19:05 +0200 Subject: [PATCH 1/2] Added huge performance improvement by running imagekit.utils.autodiscover() only once on Django > 1.7 as it was intended. --- imagekit/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/imagekit/utils.py b/imagekit/utils.py index 27902c9..03a709e 100644 --- a/imagekit/utils.py +++ b/imagekit/utils.py @@ -79,6 +79,7 @@ def autodiscover(): _autodiscover_modules_fallback() else: autodiscover_modules('imagegenerators') + _autodiscovered = True def _autodiscover_modules_fallback(): From 36fa53e249726f88090de24bb6834f2c3285675a Mon Sep 17 00:00:00 2001 From: Moritz Pfeiffer Date: Wed, 17 May 2017 09:51:24 +0200 Subject: [PATCH 2/2] Cleaned up _autodiscovered flag handling. --- imagekit/utils.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/imagekit/utils.py b/imagekit/utils.py index 03a709e..ca6727a 100644 --- a/imagekit/utils.py +++ b/imagekit/utils.py @@ -79,7 +79,7 @@ def autodiscover(): _autodiscover_modules_fallback() else: autodiscover_modules('imagegenerators') - _autodiscovered = True + _autodiscovered = True def _autodiscover_modules_fallback(): @@ -92,11 +92,6 @@ def _autodiscover_modules_fallback(): Used for Django versions < 1.7 """ - global _autodiscovered - - if _autodiscovered: - return - from django.conf import settings try: from importlib import import_module @@ -104,8 +99,6 @@ def _autodiscover_modules_fallback(): from django.utils.importlib import import_module from django.utils.module_loading import module_has_submodule - _autodiscovered = True - for app in settings.INSTALLED_APPS: # As of Django 1.7, settings.INSTALLED_APPS may contain classes instead of modules, hence the try/except # See here: https://docs.djangoproject.com/en/dev/releases/1.7/#introspecting-applications