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

Merge pull request #359 from jscheid/leave-alone-fragment-only-urls

Browse Source 
Leave alone fragment-only URLs.
This commit is contained in:
Mathieu Pillard
2013-02-04 11:59:03 -08:00
parent 1a7f1ff7cb 8254f8d707
commit b44de58a50
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compressor/filters/css_default.py
View File

@@ -91,7 +91,9 @@ class CssAbsoluteFilter(FilterBase):
def _converter(self, matchobj, group, template):
url = matchobj.group(group)
url = url.strip(' \'"')
if url.startswith(SCHEMES):
if url.startswith('#'):
return "url('%s')" % url
elif url.startswith(SCHEMES):
return "url('%s')" % self.add_suffix(url)
full_url = posixpath.normpath('/'.join([str(self.directory_name),
url]))

10
compressor/tests/test_filters.py
View File

@@ -142,6 +142,16 @@ class CssAbsolutizingTestCase(TestCase):
output = "p { background: url('%(url)simg/python.png?%(hash)s#foo') }" % params
self.assertEqual(output, filter.input(filename=filename, basename='css/url/test.css'))
def test_css_absolute_filter_only_url_fragment(self):
filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
content = "p { background: url('#foo') }"
filter = CssAbsoluteFilter(content)
self.assertEqual(content, filter.input(filename=filename, basename='css/url/test.css'))
settings.COMPRESS_URL = 'http://media.example.com/'
filter = CssAbsoluteFilter(content)
filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
self.assertEqual(content, filter.input(filename=filename, basename='css/url/test.css'))
def test_css_absolute_filter_querystring(self):
filename = os.path.join(settings.COMPRESS_ROOT, 'css/url/test.css')
imagefilename = os.path.join(settings.COMPRESS_ROOT, 'img/python.png')