Fix reading UTF-8 files which have BOM

https://github.com/django-compressor/django-compressor/issues/567
This commit is contained in:
Jere Malinen
2014-10-10 12:03:16 +03:00
parent 8170f2cd81
commit 042b45f6fd
3 changed files with 12 additions and 0 deletions

View File

@@ -140,6 +140,9 @@ class Compressor(object):
"""
Reads file contents using given `charset` and returns it as text.
"""
if charset == 'utf-8':
# Removes BOM
charset = 'utf-8-sig'
with codecs.open(filename, 'r', charset) as fd:
try:
return fd.read()

View File

@@ -0,0 +1 @@
.compress-test {color: red;}

View File

@@ -112,6 +112,14 @@ class CompressorTestCase(SimpleTestCase):
hunks = '\n'.join([h for h in self.css_node.hunks()])
self.assertEqual(out, hunks)
def test_css_output_with_bom_input(self):
out = 'body { background:#990; }\n.compress-test {color: red;}'
css = ("""<link rel="stylesheet" href="/static/css/one.css" type="text/css" />
<link rel="stylesheet" href="/static/css/utf-8_with-BOM.css" type="text/css" />""")
css_node_with_bom = CssCompressor(css)
hunks = '\n'.join([h for h in css_node_with_bom.hunks()])
self.assertEqual(out, hunks)
def test_css_mtimes(self):
is_date = re.compile(r'^\d{10}[\.\d]+$')
for date in self.css_node.mtimes: