From cd2a0040d084d77336d15bdb6bd3e7d2d0640802 Mon Sep 17 00:00:00 2001 From: Johannes Linke Date: Mon, 14 Sep 2015 00:50:24 +0200 Subject: [PATCH] Minor refactoring in compress templatetag --- compressor/templatetags/compress.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/compressor/templatetags/compress.py b/compressor/templatetags/compress.py index a409e20..7d1ec73 100644 --- a/compressor/templatetags/compress.py +++ b/compressor/templatetags/compress.py @@ -40,8 +40,7 @@ class CompressorMixin(object): def debug_mode(self, context): if settings.COMPRESS_DEBUG_TOGGLE: - # Only check for the debug parameter - # if a RequestContext was used + # Only check for the debug parameter if a RequestContext was used request = context.get('request', None) if request is not None: return settings.COMPRESS_DEBUG_TOGGLE in request.GET @@ -103,15 +102,12 @@ class CompressorMixin(object): if cache_content is not None: return cache_content - rendered_output = self.render_output(compressor, mode, forced=forced) + rendered_output = compressor.output(mode, forced=forced) assert isinstance(rendered_output, six.string_types) if cache_key: cache_set(cache_key, rendered_output) return rendered_output - def render_output(self, compressor, mode, forced=False): - return compressor.output(mode, forced=forced) - class CompressorNode(CompressorMixin, template.Node): @@ -124,14 +120,6 @@ class CompressorNode(CompressorMixin, template.Node): def get_original_content(self, context): return self.nodelist.render(context) - def debug_mode(self, context): - if settings.COMPRESS_DEBUG_TOGGLE: - # Only check for the debug parameter - # if a RequestContext was used - request = context.get('request', None) - if request is not None: - return settings.COMPRESS_DEBUG_TOGGLE in request.GET - def render(self, context, forced=False): # Check if in debug mode