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

Made sure the rel attribute of link tags can be mixed case. Fixes #125.

Browse Source
This commit is contained in:
Jannis Leidel
2011-09-23 15:32:00 +02:00
parent b4b1a8f9db
commit 22f6245d1c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compressor/css.py
View File

@@ -21,7 +21,7 @@ class CssCompressor(Compressor):
data = None data = None
elem_name = self.parser.elem_name(elem) elem_name = self.parser.elem_name(elem)
elem_attribs = self.parser.elem_attribs(elem) elem_attribs = self.parser.elem_attribs(elem)
if elem_name == 'link' and elem_attribs['rel'] == 'stylesheet': if elem_name == 'link' and elem_attribs['rel'].lower() == 'stylesheet':
basename = self.get_basename(elem_attribs['href']) basename = self.get_basename(elem_attribs['href'])
filename = self.get_filename(basename) filename = self.get_filename(basename)
data = (SOURCE_FILE, filename, basename, elem) data = (SOURCE_FILE, filename, basename, elem)

9
tests/tests/templatetags.py
View File

@@ -45,6 +45,15 @@ class TemplatetagTestCase(TestCase):
out = css_tag("/media/CACHE/css/e41ba2cc6982.css") out = css_tag("/media/CACHE/css/e41ba2cc6982.css")
self.assertEqual(out, render(template, self.context)) self.assertEqual(out, render(template, self.context))
def test_uppercase_rel(self):
template = u"""{% load compress %}{% compress css %}
<link rel="StyleSheet" href="{{ MEDIA_URL }}css/one.css" type="text/css">
<style type="text/css">p { border:5px solid green;}</style>
<link rel="StyleSheet" href="{{ MEDIA_URL }}css/two.css" type="text/css">
{% endcompress %}"""
out = css_tag("/media/CACHE/css/e41ba2cc6982.css")
self.assertEqual(out, render(template, self.context))
def test_nonascii_css_tag(self): def test_nonascii_css_tag(self):
template = u"""{% load compress %}{% compress css %} template = u"""{% load compress %}{% compress css %}
<link rel="stylesheet" href="{{ MEDIA_URL }}css/nonasc.css" type="text/css"> <link rel="stylesheet" href="{{ MEDIA_URL }}css/nonasc.css" type="text/css">