From 1088303dee50041ef4952cccb9f46ac90f7e5ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Fleschenberg?= Date: Tue, 30 Jun 2015 19:30:08 +0200 Subject: Use app registry to check for staticfiles on Django >= 1.7. This fixes issue #626. --- compressor/utils/staticfiles.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'compressor/utils') 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" -- cgit v1.2.1