Import settings from compressor.conf again instead of django.conf to make sure they are loaded correctly.

1 files changed, 5 insertions, 6 deletions

diff --git a/compressor/utils/staticfiles.py b/compressor/utils/staticfiles.py
index 1bf8f71..0bc4d0e 100644
--- a/compressor/utils/staticfiles.py
+++ b/compressor/utils/staticfiles.py
@@ -1,22 +1,21 @@
 from __future__ import absolute_import
 
-from django.conf import settings as django_settings
 from django.core.exceptions import ImproperlyConfigured
 
-INSTALLED = ("staticfiles" in django_settings.INSTALLED_APPS or
-    "django.contrib.staticfiles" in django_settings.INSTALLED_APPS)
+from compressor.conf import settings
+
+INSTALLED = ("staticfiles" in settings.INSTALLED_APPS or
+    "django.contrib.staticfiles" in settings.INSTALLED_APPS)
 
 finders = None
 settings = None
 
 if INSTALLED:
-    if "django.contrib.staticfiles" in django_settings.INSTALLED_APPS:
+    if "django.contrib.staticfiles" in settings.INSTALLED_APPS:
         from django.contrib.staticfiles import finders
-        settings = django_settings
     else:
         try:
             from staticfiles import finders
-            from staticfiles.conf import settings
         except ImportError:
             # Old (pre 1.0) and incompatible version of staticfiles
             INSTALLED = False