summaryrefslogtreecommitdiff
path: root/compressor/base.py
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-08-25 17:51:47 +0200
committerJannis Leidel <jannis@leidel.info>2011-08-25 17:52:35 +0200
commitc16e6a8df2312696a27d95f428c3c8fba58a0d5e (patch)
tree523629bd8ac6748d1611569bd2199b2fccb81bea /compressor/base.py
parentfc5c2dd7ba5fcf5700d90f58816c44aeba0db341 (diff)
downloaddjango-compressor-c16e6a8df2312696a27d95f428c3c8fba58a0d5e.tar.gz
Moved settings handling over to django-appconf and fixed coverage.
Diffstat (limited to 'compressor/base.py')
-rw-r--r--compressor/base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/compressor/base.py b/compressor/base.py
index 25f35f2..527734d 100644
--- a/compressor/base.py
+++ b/compressor/base.py
@@ -2,12 +2,13 @@ from __future__ import with_statement
import os
import codecs
+from django.conf import settings
from django.core.files.base import ContentFile
from django.template.loader import render_to_string
from django.utils.encoding import smart_unicode
from compressor.cache import get_hexdigest, get_mtime
-from compressor.conf import settings
+
from compressor.exceptions import CompressorError, UncompressableFileError
from compressor.filters import CompilerFilter
from compressor.storage import default_storage