Mime types should not be unicode strings

jazzband · Feb 19, 2014 · f0b8f72 · f0b8f72
1 parent 3f5ad20
commit f0b8f72
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/pipeline/conf.py b/pipeline/conf.py
@@ -63,11 +63,11 @@
     'PIPELINE_LESS_ARGUMENTS': '',
 
     'PIPELINE_MIMETYPES': (
-        ('text/coffeescript', '.coffee'),
-        ('text/less', '.less'),
-        ('text/javascript', '.js'),
-        ('text/x-sass', '.sass'),
-        ('text/x-scss', '.scss')
+        (b'text/coffeescript', '.coffee'),
+        (b'text/less', '.less'),
+        (b'application/javascript', '.js'),
+        (b'text/x-sass', '.sass'),
+        (b'text/x-scss', '.scss')
     ),
 
     'PIPELINE_EMBED_MAX_IMAGE_SIZE': 32700,

diff --git a/pipeline/utils.py b/pipeline/utils.py
@@ -36,7 +36,7 @@ def guess_type(path, default=None):
     mimetype, _ = mimetypes.guess_type(path)
     if not mimetype:
         return default
-    return mimetype
+    return smart_str(mimetype)
 
 
 def relpath(path, start=posixpath.curdir):

diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
@@ -35,19 +35,19 @@ def test_package_css_disabled(self):
 
     def test_package_js(self):
         template = self.env.from_string(u"""{% compressed_js "scripts" %}""")
-        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
+        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
 
     def test_package_js_async(self):
         template = self.env.from_string(u"""{% compressed_js "scripts_async" %}""")
-        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
+        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
 
     def test_package_js_defer(self):
         template = self.env.from_string(u"""{% compressed_js "scripts_defer" %}""")
-        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
+        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
 
     def test_package_js_async_defer(self):
         template = self.env.from_string(u"""{% compressed_js "scripts_async_defer" %}""")
-        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
+        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
 
 
 class DjangoTest(TestCase):
@@ -64,16 +64,16 @@ def test_compressed_css(self):
 
     def test_compressed_js(self):
         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts" %}""")
-        self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
+        self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
 
     def test_compressed_js_async(self):
         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async" %}""")
-        self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
+        self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
 
     def test_compressed_js_defer(self):
         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_defer" %}""")
-        self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
+        self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
 
     def test_compressed_js_async_defer(self):
         rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async_defer" %}""")
-        self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
+        self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)