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

Take output mode into account when caching the template tag output.

Browse Source
This commit is contained in:
Jannis Leidel
2010-06-07 15:05:16 +02:00
parent 586d89cc53
commit 6f4a9078bd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compressor/templatetags/compress.py
View File

@@ -43,14 +43,15 @@ class CompressorNode(template.Node):
compressor = CssCompressor(content) compressor = CssCompressor(content)
if self.kind == 'js': if self.kind == 'js':
compressor = JsCompressor(content) compressor = JsCompressor(content)
output = self.cache_get(compressor.cachekey) cachekey = "%s-%s" % (compressor.cachekey, self.mode)
output = self.cache_get(cachekey)
if output is None: if output is None:
try: try:
if self.mode == OUTPUT_FILE: if self.mode == OUTPUT_FILE:
output = compressor.output() output = compressor.output()
else: else:
output = compressor.output_inline() output = compressor.output_inline()
self.cache_set(compressor.cachekey, output) self.cache_set(cachekey, output)
except: except:
from traceback import format_exc from traceback import format_exc
raise Exception(format_exc()) raise Exception(format_exc())