Fix coding error rise when non-ASCII chars passed

Author: dahlia

docs/changes.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+Version 0.4.1
+-------------
+
+To be released.
+
+- Fixed :exc:`UnicodeEncodeError` that rise when the input source contains
+  any non-ASCII Unicode characters.
+
+
 Version 0.4.0
 -------------
 

sassc.py

@@ -147,7 +147,10 @@ def main(argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
                 print(css, file=stdout)
             else:
                 with open(args[1], 'w') as f:
-                    print(css, file=f)
+                    try:
+                        print(css, file=f)
+                    except UnicodeEncodeError:
+                        print(css.encode('utf-8'), file=f)
                 if options.watch:
                     print(filename, 'is just compiled to', args[1],
                           file=stdout)

sasstests.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
 
 import collections
@@ -9,7 +10,7 @@
 import tempfile
 import unittest
 
-from six import StringIO, b
+from six import StringIO, b, text_type
 from werkzeug.test import Client
 from werkzeug.wrappers import Response
 
@@ -57,6 +58,13 @@
   color: green; }
 '''
 
+D_EXPECTED_CSS = '''\
+body {
+  background-color: green; }
+  body a {
+    font: '나눔고딕', sans-serif; }
+'''
+
 
 class SassTestCase(unittest.TestCase):
 
@@ -141,6 +149,14 @@ def test_compile_string(self):
   a b {
     color: blue; }
 '''
+        actual = sass.compile(string=u'a { color: blue; } /* 유니코드 */')
+        self.assertEqual(
+            u'''a {
+  color: blue; }
+
+/* 유니코드 */''',
+            actual
+        )
         self.assertRaises(sass.CompileError, sass.compile,
                           string='a { b { color: blue; }')
         # sass.CompileError should be a subtype of ValueError
@@ -158,6 +174,11 @@ def test_compile_filename(self):
         assert actual == A_EXPECTED_CSS
         actual = sass.compile(filename='test/c.sass')
         assert actual == C_EXPECTED_CSS
+        actual = sass.compile(filename='test/d.sass')
+        if text_type is str:
+            self.assertEqual(D_EXPECTED_CSS, actual)
+        else:
+            self.assertEqual(D_EXPECTED_CSS.decode('utf-8'), actual)
         self.assertRaises(IOError, sass.compile,
                           filename='test/not-exist.sass')
         self.assertRaises(TypeError, sass.compile, filename=1234)
@@ -205,7 +226,7 @@ def test_builder_build_directory(self):
         css_path = os.path.join(temp_path, 'css')
         shutil.copytree('test', sass_path)
         result_files = build_directory(sass_path, css_path)
-        assert len(result_files) == 3
+        assert len(result_files) == 4
         assert result_files['a.sass'] == 'a.sass.css'
         with open(os.path.join(css_path, 'a.sass.css')) as f:
             css = f.read()
@@ -218,6 +239,10 @@ def test_builder_build_directory(self):
         with open(os.path.join(css_path, 'c.sass.css')) as f:
             css = f.read()
         assert css == C_EXPECTED_CSS
+        assert result_files['d.sass'] == 'd.sass.css'
+        with open(os.path.join(css_path, 'd.sass.css')) as f:
+            css = f.read()
+        self.assertEqual(D_EXPECTED_CSS, css)
         shutil.rmtree(temp_path)
 
 
@@ -345,6 +370,23 @@ def test_sassc_output(self):
         finally:
             os.remove(tmp)
 
+    def test_sassc_output_unicode(self):
+        fd, tmp = tempfile.mkstemp('.css')
+        try:
+            os.close(fd)
+            exit_code = sassc.main(['sassc', 'test/d.sass', tmp],
+                                   self.out, self.err)
+            self.assertEqual(0, exit_code)
+            self.assertEqual('', self.err.getvalue())
+            self.assertEqual('', self.out.getvalue())
+            with open(tmp) as f:
+                self.assertEqual(
+                    D_EXPECTED_CSS.strip(),
+                    f.read().strip()
+                )
+        finally:
+            os.remove(tmp)
+
     def test_sassc_source_map_without_css_filename(self):
         exit_code = sassc.main(['sassc', '-m', 'a.scss'], self.out, self.err)
         self.assertEqual(2, exit_code)

sassutils/builder.py

@@ -50,7 +50,10 @@ def build_directory(sass_path, css_path, _root_sass=None, _root_css=None):
             css_fullname = os.path.join(css_path, name) + '.css'
             css = compile(filename=sass_fullname, include_paths=[_root_sass])
             with open(css_fullname, 'w') as css_file:
-                css_file.write(css)
+                try:
+                    css_file.write(css)
+                except UnicodeEncodeError:
+                    css_file.write(css.encode('utf-8'))
             result[os.path.relpath(sass_fullname, _root_sass)] = \
                 os.path.relpath(css_fullname, _root_css)
         elif os.path.isdir(sass_fullname):

test/d.sass

@@ -0,0 +1,11 @@
+
+@mixin mx {
+  background-color: green;
+}
+
+body {
+  @include mx;
+  a {
+    font: '나눔고딕', sans-serif;
+  }
+}