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

Merge pull request #756 from grzegorzswica/fix-options-conversion-in-compile-filter 

Use proper options dict for conversion to tuple in CompilerFilter
This commit is contained in:
karyon 2016-04-18 21:31:53 +02:00
parent 38cbfdb389 616c41ced1
commit d1ea3df0f8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compressor/filters/base.py
View File

@ -126,7 +126,7 @@ class CompilerFilter(FilterBase):
if isinstance(self.options, dict):
# turn dict into a tuple
new_options = ()
for item in kwargs.items():
for item in self.options.items():
new_options += (item,)
self.options = new_options

9
compressor/tests/test_filters.py
View File

@ -41,6 +41,15 @@ class PrecompilerTestCase(TestCase):
with io.open(self.filename, encoding=settings.FILE_CHARSET) as file:
self.content = file.read()
def test_precompiler_dict_options(self):
command = "%s %s {option}" % (sys.executable, self.test_precompiler)
option = ("option", "option",)
CompilerFilter.options = dict([option])
compiler = CompilerFilter(
content=self.content, filename=self.filename,
charset=settings.FILE_CHARSET, command=command)
self.assertIn(option, compiler.options)
def test_precompiler_infile_outfile(self):
command = '%s %s -f {infile} -o {outfile}' % (sys.executable, self.test_precompiler)
compiler = CompilerFilter(