Fixed a few minor things.

This commit is contained in:
Jannis Leidel
2012-01-30 19:37:10 +01:00
parent b185a0f9ef
commit 35eaaf3f4a
3 changed files with 5 additions and 6 deletions

View File

@@ -35,14 +35,13 @@ class CompressorExtension(CompressorMixin, Extension):
def _compress(self, kind, mode, caller):
# This extension assumes that we won't force compression
forced = False
mode = mode or OUTPUT_FILE
original_content = caller()
context = {
'original_content': original_content
}
return self.render_compressed(context, kind, mode, forced=forced)
def get_original_content(self, context):
return context['original_content']

View File

@@ -66,7 +66,7 @@ class Command(NoArgsCommand):
from django.template.loader import (
find_template_source as finder_func)
try:
# Force django to calculate template_source_loaders from
# Force django to calculate template_source_loaders from
# TEMPLATE_LOADERS settings, by asking to find a dummy template
source, name = finder_func('test')
except TemplateDoesNotExist:

View File

@@ -234,7 +234,7 @@ class PrecompilerTemplatetagTestCase(TestCase):
<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/two.css"></link>
{% endcompress %}"""
out = '\n'.join([
out = ''.join([
'<link rel="stylesheet" type="text/css" href="/media/css/one.css" />',
'<link rel="stylesheet" type="text/css" href="/media/css/two.css" />'])
@@ -254,7 +254,7 @@ class PrecompilerTemplatetagTestCase(TestCase):
<link rel="stylesheet" type="text/less" href="{{ MEDIA_URL }}css/url/test.css"/>
{% endcompress %}"""
out = '\n'.join([
out = ''.join([
'<link rel="stylesheet" type="text/css" href="/media/css/one.css" />',
'<link rel="stylesheet" type="text/css" href="/media/css/two.css" />',
'<link rel="stylesheet" href="/media/CACHE/css/test.c4f8a285c249.css" type="text/css" />'])