Merge remote-tracking branch 'jezdez/develop' into py3_new

Conflicts: compressor/filters/base.py
2013-04-16 13:41:00 +02:00
parent b5a2277071 8a04ae4eee
commit f58a723096
3 changed files with 9 additions and 2 deletions
--- a/compressor/tests/test_filters.py
+++ b/compressor/tests/test_filters.py
@@ -79,6 +79,11 @@ class PrecompilerTestCase(TestCase):
            charset=settings.FILE_CHARSET, command=command)
        self.assertEqual("body { color:#990; }%s" % os.linesep, compiler.input())

+    def test_precompiler_output_unicode(self):
+        command = '%s %s' % (sys.executable, self.test_precompiler)
+        compiler = CompilerFilter(content=self.content, filename=self.filename, command=command)
+        self.assertEqual(type(compiler.input()), unicode)
+

 class CssMinTestCase(TestCase):
    def test_cssmin_filter(self):