From 019685e87ef4658c2f652d0c0deba2cc44532d8c Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Fri, 8 Apr 2011 15:08:29 +0200
Subject: [PATCH] Updated the CompilerFilter filters to use the new style
 command string formatting.

---
 compressor/filters/base.py    | 8 ++++----
 compressor/filters/closure.py | 2 +-
 compressor/filters/csstidy.py | 2 +-
 compressor/filters/yui.py     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compressor/filters/base.py b/compressor/filters/base.py
index 0123ead..54f0498 100644
--- a/compressor/filters/base.py
+++ b/compressor/filters/base.py
@@ -38,6 +38,7 @@ class CompilerFilter(FilterBase):
             self.command = command
         if self.command is None:
             raise FilterError("Required command attribute not set")
+        self.options = {}
         self.stdout = subprocess.PIPE
         self.stdin = subprocess.PIPE
         self.stderr = subprocess.PIPE
@@ -45,18 +46,17 @@ class CompilerFilter(FilterBase):
     def output(self, **kwargs):
         infile = None
         outfile = None
-        options = {}
         try:
             if "{infile}" in self.command:
                 infile = tempfile.NamedTemporaryFile(mode='w')
                 infile.write(self.content)
                 infile.flush()
-                options["infile"] = infile.name
+                self.options["infile"] = infile.name
             if "{outfile}" in self.command:
                 ext = ".%s" % self.type and self.type or ""
                 outfile = tempfile.NamedTemporaryFile(mode='w', suffix=ext)
-                options["outfile"] = outfile.name
-            cmd = FormattableString(self.command).format(**options)
+                self.options["outfile"] = outfile.name
+            cmd = FormattableString(self.command).format(**self.options)
             proc = subprocess.Popen(cmd_split(cmd),
                 stdout=self.stdout, stdin=self.stdin, stderr=self.stderr)
             if infile is not None:
diff --git a/compressor/filters/closure.py b/compressor/filters/closure.py
index 0740d19..f89bcf9 100644
--- a/compressor/filters/closure.py
+++ b/compressor/filters/closure.py
@@ -3,7 +3,7 @@ from compressor.filters import CompilerFilter
 
 
 class ClosureCompilerFilter(CompilerFilter):
-    command = "%(binary)s %(args)s"
+    command = "{binary} {args}"
     options = {
         "binary": settings.COMPRESS_CLOSURE_COMPILER_ARGUMENTS,
         "args": settings.COMPRESS_CLOSURE_COMPILER_ARGUMENTS,
diff --git a/compressor/filters/csstidy.py b/compressor/filters/csstidy.py
index 3260753..a8428cc 100644
--- a/compressor/filters/csstidy.py
+++ b/compressor/filters/csstidy.py
@@ -3,7 +3,7 @@ from compressor.filters import CompilerFilter
 
 
 class CSSTidyFilter(CompilerFilter):
-    command = "%(binary)s %(infile)s %(args)s %(outfile)s"
+    command = "{binary} {infile} {args} {outfile}"
     options = {
         "binary": settings.COMPRESS_CSSTIDY_BINARY,
         "args": settings.COMPRESS_CSSTIDY_ARGUMENTS,
diff --git a/compressor/filters/yui.py b/compressor/filters/yui.py
index 199cb2d..0ce76af 100644
--- a/compressor/filters/yui.py
+++ b/compressor/filters/yui.py
@@ -3,7 +3,7 @@ from compressor.filters import CompilerFilter
 
 
 class YUICompressorFilter(CompilerFilter):
-    command = "%(binary)s %(args)s"
+    command = "{binary} {args}"
 
     def __init__(self, *args, **kwargs):
         super(YUICompressorFilter, self).__init__(*args, **kwargs)