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

Refactored the CSSCompressor's output method to not accidentally trigger file lookups.

Browse Source
This commit is contained in:
Jannis Leidel
2011-04-13 00:57:43 +02:00
parent 5aa192ad87
commit 73e14ceef6
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
compressor/css.py
View File

@@ -44,14 +44,13 @@ class CssCompressor(Compressor):
def output(self, *args, **kwargs): def output(self, *args, **kwargs):
# Populate self.split_content # Populate self.split_content
self.split_contents()
if not hasattr(self, 'media_nodes'):
return super(CssCompressor, self).output(*args, **kwargs)
if (settings.COMPRESS_ENABLED or settings.COMPRESS_PRECOMPILERS or if (settings.COMPRESS_ENABLED or settings.COMPRESS_PRECOMPILERS or
kwargs.get('forced', False)): kwargs.get('forced', False)):
ret = [] self.split_contents()
for media, subnode in self.media_nodes: if hasattr(self, 'media_nodes'):
subnode.extra_context.update({'media': media}) ret = []
ret.append(subnode.output(*args, **kwargs)) for media, subnode in self.media_nodes:
return ''.join(ret) subnode.extra_context.update({'media': media})
return self.content ret.append(subnode.output(*args, **kwargs))
return ''.join(ret)
return super(CssCompressor, self).output(*args, **kwargs)