Fix AppVeyor build failure

Author: dahlia

appveyor.yml

@@ -4,6 +4,9 @@ environment:
     VS90COMNTOOLS: "%VS110COMNTOOLS%"
     VS100COMNTOOLS: "%VS110COMNTOOLS%"
   matrix:
+  - PYTHON: "C:\\Python27_32"
+    PYTHON_VERSION: "2.7.8"
+    PYTHON_ARCH: "32"
   - PYTHON: "C:\\Python34_32"
     PYTHON_VERSION: "3.4.1"
     PYTHON_ARCH: "32"
@@ -13,6 +16,8 @@ environment:
 matrix:
   fast_finish: true
 init:
+- ps: "$env:Path = \"C:\\Program Files (x86)\\Microsoft Visual Studio 11.0\\VC\\bin;\" + $env:Path"
+- "ECHO %PATH%"
 - "ECHO %PYTHON%"
 - ps: "ls C:/Python*"
 install:
@@ -21,6 +26,8 @@ install:
 - "powershell C:/python-install.ps1"
 build: false
 test_script:
+- "dir \"C:\\Program Files (x86)\""
+- "%PYTHON%\\python.exe -c \"import os,pprint;pprint.pprint(os.environ)\""
 - "%PYTHON%\\python.exe setup.py test"
 after_test:
 - ps: (new-object net.webclient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'C:/get-pip.py')

sass.py

@@ -13,6 +13,7 @@
 import collections
 import os
 import os.path
+import re
 import sys
 
 from six import string_types, text_type
@@ -244,7 +245,37 @@ def compile(**kwargs):
         if s:
             v = v.decode('utf-8')
             if source_map_filename:
-                v = v, source_map.decode('utf-8')
+                source_map = source_map.decode('utf-8')
+                if os.sep != '/' and os.altsep:
+                    # Libsass has a bug that produces invalid JSON string
+                    # literals which contain unescaped backslashes for
+                    # "sources" paths on Windows e.g.:
+                    #
+                    #   {
+                    #     "version": 3,
+                    #     "file": "",
+                    #     "sources": ["c:\temp\tmpj2ac07\test\b.scss"],
+                    #     "names": [],
+                    #     "mappings": "AAAA,EAAE;EAEE,WAAW"
+                    #   }
+                    #
+                    # To workaround this bug without changing libsass'
+                    # internal behavior, we replace these backslashes with
+                    # slashes e.g.:
+                    #
+                    #   {
+                    #     "version": 3,
+                    #     "file": "",
+                    #     "sources": ["c:/temp/tmpj2ac07/test/b.scss"],
+                    #     "names": [],
+                    #     "mappings": "AAAA,EAAE;EAEE,WAAW"
+                    #   }
+                    source_map = re.sub(
+                        r'"sources":\s*\[\s*"[^"]*"(?:\s*,\s*"[^"]*")*\s*\]',
+                        lambda m: m.group(0).replace(os.sep, os.altsep),
+                        source_map
+                    )
+                v = v, source_map
             return v
     elif 'dirname' in modes:
         try:

sassc.py

@@ -54,6 +54,7 @@
 from __future__ import print_function
 
 import functools
+import io
 import optparse
 import os
 import sys
@@ -146,16 +147,13 @@ def main(argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
             if len(args) < 2:
                 print(css, file=stdout)
             else:
-                with open(args[1], 'w') as f:
-                    try:
-                        print(css, file=f)
-                    except UnicodeEncodeError:
-                        print(css.encode('utf-8'), file=f)
+                with io.open(args[1], 'w', encoding='utf-8') as f:
+                    f.write(css)
                 if options.watch:
                     print(filename, 'is just compiled to', args[1],
                           file=stdout)
             if source_map_filename:
-                with open(source_map_filename, 'w') as f:
+                with io.open(source_map_filename, 'w', encoding='utf-8') as f:
                     f.write(source_map)
         if options.watch:  # pragma: no cover
             # FIXME: we should utilize inotify on Linux, and FSEvents on Mac

sasstests.py

@@ -2,6 +2,7 @@
 from __future__ import with_statement
 
 import collections
+import io
 import json
 import os
 import os.path
@@ -10,7 +11,7 @@
 import tempfile
 import unittest
 
-from six import StringIO, b, text_type
+from six import PY3, StringIO, b, text_type
 from werkzeug.test import Client
 from werkzeug.wrappers import Response
 
@@ -65,6 +66,8 @@
     font: '나눔고딕', sans-serif; }
 '''
 
+utf8_if_py3 = {'encoding': 'utf-8'} if PY3 else {}
+
 
 class SassTestCase(unittest.TestCase):
 
@@ -221,26 +224,26 @@ def test_regression_issue_11(self):
 class BuilderTestCase(unittest.TestCase):
 
     def test_builder_build_directory(self):
-        temp_path= tempfile.mkdtemp()
+        temp_path = tempfile.mkdtemp()
         sass_path = os.path.join(temp_path, 'sass')
         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) == 4
         assert result_files['a.scss'] == 'a.scss.css'
-        with open(os.path.join(css_path, 'a.scss.css')) as f:
+        with open(os.path.join(css_path, 'a.scss.css'), **utf8_if_py3) as f:
             css = f.read()
         assert css == A_EXPECTED_CSS
         assert result_files['b.scss'] == 'b.scss.css'
-        with open(os.path.join(css_path, 'b.scss.css')) as f:
+        with open(os.path.join(css_path, 'b.scss.css'), **utf8_if_py3) as f:
             css = f.read()
         assert css == B_EXPECTED_CSS
         assert result_files['c.scss'] == 'c.scss.css'
-        with open(os.path.join(css_path, 'c.scss.css')) as f:
+        with open(os.path.join(css_path, 'c.scss.css'), **utf8_if_py3) as f:
             css = f.read()
         assert css == C_EXPECTED_CSS
         assert result_files['d.scss'] == 'd.scss.css'
-        with open(os.path.join(css_path, 'd.scss.css')) as f:
+        with open(os.path.join(css_path, 'd.scss.css'), **utf8_if_py3) as f:
             css = f.read()
         self.assertEqual(D_EXPECTED_CSS, css)
         shutil.rmtree(temp_path)
@@ -267,51 +270,68 @@ def test_normalize_manifests(self):
 
     def test_build_one(self):
         d = tempfile.mkdtemp()
+        src_path = os.path.join(d, 'test')
+        if os.sep != '/' and os.altsep:
+            normalize = lambda p: os.path.abspath(
+                os.path.normpath(os.path.join(src_path, p))
+            ).replace(os.sep, os.altsep)
+        else:
+            normalize = lambda p: p
         try:
-            shutil.copytree('test', os.path.join(d, 'test'))
+            shutil.copytree('test', src_path)
             m = Manifest(sass_path='test', css_path='css')
             m.build_one(d, 'a.scss')
             with open(os.path.join(d, 'css', 'a.scss.css')) as f:
                 self.assertEqual(A_EXPECTED_CSS, f.read())
             m.build_one(d, 'b.scss', source_map=True)
-            with open(os.path.join(d, 'css', 'b.scss.css')) as f:
+            with open(os.path.join(d, 'css', 'b.scss.css'),
+                      **utf8_if_py3) as f:
                 self.assertEqual(
                     B_EXPECTED_CSS +
                     '\n/*# sourceMappingURL=b.scss.css.map */',
                     f.read()
                 )
-            with open(os.path.join(d, 'css', 'b.scss.css.map')) as f:
-                self.assertEqual(
-                    {
-                        'version': 3,
-                        'file': '',
-                        'sources': ['../test/b.scss'],
-                        'names': [],
-                        'mappings': 'AAAA,EAAE;EAEE,WAAW'
-                    },
-                    json.load(f)
-                )
+            self.assert_json_file(
+                {
+                    'version': 3,
+                    'file': '',
+                    'sources': [normalize('../test/b.scss')],
+                    'names': [],
+                    'mappings': 'AAAA,EAAE;EAEE,WAAW'
+                },
+                os.path.join(d, 'css', 'b.scss.css.map')
+            )
             m.build_one(d, 'd.scss', source_map=True)
-            with open(os.path.join(d, 'css', 'd.scss.css')) as f:
+            with open(os.path.join(d, 'css', 'd.scss.css'),
+                      **utf8_if_py3) as f:
                 self.assertEqual(
                     D_EXPECTED_CSS +
                     '\n/*# sourceMappingURL=d.scss.css.map */',
                     f.read()
                 )
-            with open(os.path.join(d, 'css', 'd.scss.css.map')) as f:
-                self.assertEqual(
-                    {
-                        'version': 3,
-                        'file': '',
-                        'sources': ['../test/d.scss'],
-                        'names': [],
-                        'mappings': 'AAKA;EAHE,kBAAkB;EAIpB,KAAK;IAED,MAAM'
-                    },
-                    json.load(f)
-                )
+            self.assert_json_file(
+                {
+                    'version': 3,
+                    'file': '',
+                    'sources': [normalize('../test/d.scss')],
+                    'names': [],
+                    'mappings': 'AAKA;EAHE,kBAAkB;EAIpB,KAAK;IAED,MAAM'
+                },
+                os.path.join(d, 'css', 'd.scss.css.map')
+            )
         finally:
             shutil.rmtree(d)
 
+    def assert_json_file(self, expected, filename):
+        with open(filename) as f:
+            try:
+                tree = json.load(f)
+            except ValueError as e:
+                f.seek(0)
+                msg = '{0!s}\n\n{1}:\n\n{2}'.format(e, filename, f.read())
+                raise ValueError(msg)
+        self.assertEqual(expected, tree)
+
 
 class WsgiTestCase(unittest.TestCase):
 
@@ -329,19 +349,24 @@ def test_wsgi_sass_middleware(self):
             client = Client(app, Response)
             r = client.get('/asdf')
             self.assertEqual(200, r.status_code)
-            self.assertEqual(b'/asdf', r.data)
+            self.assert_bytes_equal(b'/asdf', r.data)
             self.assertEqual('text/plain', r.mimetype)
             r = client.get('/static/a.scss.css')
             self.assertEqual(200, r.status_code)
-            self.assertEqual(b(A_EXPECTED_CSS_WITH_MAP), r.data)
+            self.assert_bytes_equal(b(A_EXPECTED_CSS_WITH_MAP), r.data)
             self.assertEqual('text/css', r.mimetype)
             r = client.get('/static/not-exists.sass.css')
             self.assertEqual(200, r.status_code)
-            self.assertEqual(b'/static/not-exists.sass.css', r.data)
+            self.assert_bytes_equal(b'/static/not-exists.sass.css', r.data)
             self.assertEqual('text/plain', r.mimetype)
         finally:
             shutil.rmtree(css_dir)
 
+    def assert_bytes_equal(self, expected, actual, *args):
+        self.assertEqual(expected.replace(b'\r\n', b'\n'),
+                         actual.replace(b'\r\n', b'\n'),
+                         *args)
+
 
 class SasscTestCase(unittest.TestCase):
 
@@ -397,7 +422,7 @@ def test_sassc_output_unicode(self):
             self.assertEqual(0, exit_code)
             self.assertEqual('', self.err.getvalue())
             self.assertEqual('', self.out.getvalue())
-            with open(tmp) as f:
+            with open(tmp, **utf8_if_py3) as f:
                 self.assertEqual(
                     D_EXPECTED_CSS.strip(),
                     f.read().strip()

sassutils/builder.py

@@ -5,6 +5,7 @@
 from __future__ import with_statement
 
 import collections
+import io
 import os
 import os.path
 import re
@@ -49,11 +50,8 @@ def build_directory(sass_path, css_path, _root_sass=None, _root_css=None):
         if os.path.isfile(sass_fullname):
             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:
-                try:
-                    css_file.write(css)
-                except UnicodeEncodeError:
-                    css_file.write(css.encode('utf-8'))
+            with io.open(css_fullname, 'w', encoding='utf-8') as css_file:
+                css_file.write(css)
             result[os.path.relpath(sass_fullname, _root_sass)] = \
                 os.path.relpath(css_fullname, _root_css)
         elif os.path.isdir(sass_fullname):
@@ -195,13 +193,10 @@ def build_one(self, package_dir, filename, source_map=False):
         css_folder = os.path.dirname(css_path)
         if not os.path.exists(css_folder):
             os.makedirs(css_folder)
-        with open(css_path, 'w') as f:
-            try:
-                f.write(css)
-            except UnicodeEncodeError:
-                f.write(css.encode('utf-8'))
+        with io.open(css_path, 'w', encoding='utf-8') as f:
+            f.write(css)
         if source_map:
-            with open(source_map_path, 'wb') as f:
-                # Source maps are JSON, and JSON has to be UTF-8 encoded
-                f.write(source_map.encode('utf-8'))
+            # Source maps are JSON, and JSON has to be UTF-8 encoded
+            with io.open(source_map_path, 'w', encoding='utf-8') as f:
+                f.write(source_map)
         return css_filename

setup.py

@@ -52,7 +52,6 @@
     raise SystemExit(1)
 
 if sys.platform == 'win32':
-    from distutils.msvccompiler import MSVCCompiler
     from distutils.msvc9compiler import get_build_version
     vscomntools_env = 'VS{0}{1}COMNTOOLS'.format(
         int(get_build_version()),
@@ -63,12 +62,12 @@
     except KeyError:
         distutils.log.warn('You probably need Visual Studio 2012 (11.0) '
                            'or higher')
-    distutils.log.warn('%%%s%%=%s',
-                       vscomntools_env,
-                       os.environ.get(vscomntools_env, ''))
-    c = MSVCCompiler()
-    c.initialize()
-    distutils.log.warn('msvc_paths = %r', c.get_msvc_paths('path'))
+    from distutils import msvccompiler, msvc9compiler
+    if msvccompiler.get_build_version() < 11.0:
+        msvccompiler.get_build_version = lambda: 11.0
+    if get_build_version() < 11.0:
+        msvc9compiler.get_build_version = lambda: 11.0
+        msvc9compiler.VERSION = 11.0
     # Workaround http://bugs.python.org/issue4431 under Python <= 2.6
     if sys.version_info < (2, 7):
         def spawn(self, cmd):