summaryrefslogtreecommitdiff
path: root/compressor/css.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-02-04 18:12:03 +0100
committerJannis Leidel <jannis@leidel.info>2011-02-04 18:12:03 +0100
commit45d8ff1698e1e9981edf42883b6fa81b01e34ba7 (patch)
tree4abad2cb15037a22d74689ed1164d092bbfdecc4 /compressor/css.py
parentf893827a3fa874e6c8e22cf828e83dbae4d8433a (diff)
downloaddjango-compressor-45d8ff1698e1e9981edf42883b6fa81b01e34ba7.tar.gz
Renamed the internal settings to be less confusing (potentially backwards incompatible for users that imported those directly) and added quite some checks to be a little more helpful when setting up compressor together with staticfiles (whether contrib's staticfiles or the external app).
Diffstat (limited to 'compressor/css.py')
-rw-r--r--compressor/css.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/compressor/css.py b/compressor/css.py
index bdcbb32..79acb87 100644
--- a/compressor/css.py
+++ b/compressor/css.py
@@ -11,7 +11,7 @@ class CssCompressor(Compressor):
self.extension = ".css"
self.template_name = "compressor/css.html"
self.template_name_inline = "compressor/css_inline.html"
- self.filters = list(settings.COMPRESS_CSS_FILTERS)
+ self.filters = list(settings.CSS_FILTERS)
self.type = 'css'
def split_contents(self):
@@ -48,7 +48,7 @@ class CssCompressor(Compressor):
self.split_contents()
if not hasattr(self, 'media_nodes'):
return super(CssCompressor, self).output()
- if not settings.COMPRESS:
+ if not settings.ENABLED:
return self.content
ret = []
for media, subnode in self.media_nodes: