From 73e14ceef69a578e260271dfb64349bcd718ffad Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 13 Apr 2011 00:57:43 +0200 Subject: Refactored the CSSCompressor's output method to not accidentally trigger file lookups. --- compressor/css.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'compressor/css.py') diff --git a/compressor/css.py b/compressor/css.py index 9f4ae58..d7922b5 100644 --- a/compressor/css.py +++ b/compressor/css.py @@ -44,14 +44,13 @@ class CssCompressor(Compressor): def output(self, *args, **kwargs): # 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 kwargs.get('forced', False)): - ret = [] - for media, subnode in self.media_nodes: - subnode.extra_context.update({'media': media}) - ret.append(subnode.output(*args, **kwargs)) - return ''.join(ret) - return self.content + self.split_contents() + if hasattr(self, 'media_nodes'): + ret = [] + for media, subnode in self.media_nodes: + subnode.extra_context.update({'media': media}) + ret.append(subnode.output(*args, **kwargs)) + return ''.join(ret) + return super(CssCompressor, self).output(*args, **kwargs) -- cgit v1.2.1