Introduced a default extra_context dictionary.

spookylukey · Feb 16, 2011 · 95da02a · 95da02a
1 parent bda59c0
commit 95da02a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/compressor/base.py b/compressor/base.py
@@ -13,6 +13,7 @@ class Compressor(object):
 
     def __init__(self, content=None, output_prefix="compressed"):
         self.content = content or ""
+        self.extra_context = {}
         self.type = None
         self.output_prefix = output_prefix
         self.split_content = []
@@ -131,13 +132,17 @@ def save_file(self):
     def output(self):
         if not settings.COMPRESS_ENABLED:
             return self.content
-        self.save_file()
-        context = getattr(self, 'extra_context', {})
-        context['url'] = self.storage.url(self.new_filepath)
+        context = {
+            "saved": self.save_file(),
+            "url": self.storage.url(self.new_filepath),
+        }
+        context.update(self.extra_context)
         return render_to_string(self.template_name, context)
 
     def output_inline(self):
-        context = {'content': settings.COMPRESS_ENABLED and self.combined or self.concat()}
-        if hasattr(self, 'extra_context'):
-            context.update(self.extra_context)
+        if settings.COMPRESS_ENABLED:
+            content = self.combined
+        else:
+            content = self.concat()
+        context = dict(content=content, **self.extra_context)
         return render_to_string(self.template_name_inline, context)
diff --git a/compressor/css.py b/compressor/css.py
@@ -49,6 +49,6 @@ def output(self):
             return self.content
         ret = []
         for media, subnode in self.media_nodes:
-            subnode.extra_context = {'media': media}
+            subnode.extra_context.update({'media': media})
             ret.append(subnode.output())
         return ''.join(ret)