summaryrefslogtreecommitdiff
path: root/compressor/utils
diff options
context:
space:
mode:
authorRené Fleschenberg <rene@fleschenberg.net>2015-06-30 19:30:08 +0200
committerRené Fleschenberg <rene@fleschenberg.net>2015-06-30 22:03:53 +0200
commit1088303dee50041ef4952cccb9f46ac90f7e5ff2 (patch)
treec9d1a980af91a8cb82f15032fd7b078256a50217 /compressor/utils
parent60ada6988047e2257b3f74af340f3944c4959367 (diff)
downloaddjango-compressor-1088303dee50041ef4952cccb9f46ac90f7e5ff2.tar.gz
Use app registry to check for staticfiles on Django >= 1.7.
This fixes issue #626.
Diffstat (limited to 'compressor/utils')
-rw-r--r--compressor/utils/staticfiles.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/compressor/utils/staticfiles.py b/compressor/utils/staticfiles.py
index 2d9ed00..d65d318 100644
--- a/compressor/utils/staticfiles.py
+++ b/compressor/utils/staticfiles.py
@@ -1,10 +1,19 @@
from __future__ import absolute_import, unicode_literals
+import django
from django.core.exceptions import ImproperlyConfigured
from compressor.conf import settings
-if "django.contrib.staticfiles" in settings.INSTALLED_APPS:
+
+def staticfiles_installed():
+ if django.VERSION < (1, 7):
+ return "django.contrib.staticfiles" in settings.INSTALLED_APPS
+ from django.apps import apps
+ return apps.is_installed("django.contrib.staticfiles")
+
+
+if staticfiles_installed():
from django.contrib.staticfiles import finders # noqa
if ("compressor.finders.CompressorFinder"