openstack/deb-python-django-compressor
Code Issues Proposed changes

Minor refactoring in Compressor's constructor

Browse Source
This commit is contained in:
Johannes Linke
2015-09-11 15:09:51 +02:00
parent 6129c9a621
commit 0a0e0b376e
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compressor/base.py
View File

@@ -36,15 +36,17 @@ class Compressor(object):
Base compressor object to be subclassed for content type Base compressor object to be subclassed for content type
depending implementations details. depending implementations details.
""" """
type = None
def __init__(self, content=None, output_prefix=None, context=None, *args, **kwargs): def __init__(self, content=None, output_prefix=None,
context=None, filters=None, *args, **kwargs):
self.content = content or "" # rendered contents of {% compress %} tag self.content = content or "" # rendered contents of {% compress %} tag
self.output_prefix = output_prefix or "compressed" self.output_prefix = output_prefix or "compressed"
self.output_dir = settings.COMPRESS_OUTPUT_DIR.strip('/') self.output_dir = settings.COMPRESS_OUTPUT_DIR.strip('/')
self.charset = settings.DEFAULT_CHARSET self.charset = settings.DEFAULT_CHARSET
self.split_content = [] self.split_content = []
self.context = context or {} self.context = context or {}
self.type = output_prefix or ""
self.filters = filters or []
self.extra_context = {} self.extra_context = {}
self.precompiler_mimetypes = dict(settings.COMPRESS_PRECOMPILERS) self.precompiler_mimetypes = dict(settings.COMPRESS_PRECOMPILERS)
self.finders = staticfiles.finders self.finders = staticfiles.finders

6
compressor/css.py
View File

@@ -5,10 +5,8 @@ from compressor.conf import settings
class CssCompressor(Compressor): class CssCompressor(Compressor):
def __init__(self, content=None, output_prefix="css", context=None): def __init__(self, content=None, output_prefix="css", context=None):
super(CssCompressor, self).__init__(content=content, filters = list(settings.COMPRESS_CSS_FILTERS)
output_prefix=output_prefix, context=context) super(CssCompressor, self).__init__(content, output_prefix, context, filters)
self.filters = list(settings.COMPRESS_CSS_FILTERS)
self.type = output_prefix
def split_contents(self): def split_contents(self):
if self.split_content: if self.split_content:

5
compressor/js.py
View File

@@ -5,9 +5,8 @@ from compressor.base import Compressor, SOURCE_HUNK, SOURCE_FILE
class JsCompressor(Compressor): class JsCompressor(Compressor):
def __init__(self, content=None, output_prefix="js", context=None): def __init__(self, content=None, output_prefix="js", context=None):
super(JsCompressor, self).__init__(content, output_prefix, context) filters = list(settings.COMPRESS_JS_FILTERS)
self.filters = list(settings.COMPRESS_JS_FILTERS) super(JsCompressor, self).__init__(content, output_prefix, context, filters)
self.type = output_prefix
def split_contents(self): def split_contents(self):
if self.split_content: if self.split_content: