Merge pull request #64 from asottile/32bugfixes

dahlia · dahlia · commit 31d5e1673c08 · 2015-05-02T14:20:29.000+09:00
3.2.1 and 3.2.2
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -6,8 +6,9 @@ Version 0.8.0
 
 To be released.
 
-- Follow up the libsass upstream: 3.2.0 --- See the `release note`__ of Libsass.
-  [:issue:`61`, :issue:`52`, :issue:`56`, :issue:`58`, :issue:`62`
+- Follow up the libsass upstream: 3.2.2 --- See the release notes of Libsass
+  3.2.0__, 3.2.1__, and 3.2.2__.
+  [:issue:`61`, :issue:`52`, :issue:`56`, :issue:`58`, :issue:`62`, :issue:`64`
   by Anthony Sottile]
 
   - Compact and expanded output styles  [:issue:`37`]
@@ -25,6 +26,8 @@ To be released.
   with level ``ERROR``.  [:issue:`42`]
 
 __ https://github.com/sass/libsass/releases/tag/3.2.0
+__ https://github.com/sass/libsass/releases/tag/3.2.1
+__ https://github.com/sass/libsass/releases/tag/3.2.2
 
 
 Version 0.7.0
diff --git a/libsass b/libsass
@@ -1 +1 @@
-Subproject commit 20d887093075b4d219df441acca19e40ee765740
+Subproject commit 66631c07ba6e2ff2f740924369114ab9248f168d
diff --git a/sasstests.py b/sasstests.py
@@ -1015,7 +1015,7 @@ def test_raises(self):
                 r'^Error: error in C function raises: \n'
                 r'       Traceback \(most recent call last\):\n'
                 r'.+'
-                r'AssertionError: foo\n\n'
+                r'AssertionError: foo\n\n\n'
                 r'       Backtrace:\n'
                 r'       \tstdin:1, in function `raises`\n'
                 r'       \tstdin:1\n'
@@ -1028,7 +1028,7 @@ def test_raises(self):
     def test_warning(self):
         with assert_raises_compile_error(
                 'Error: warning in C function returns_warning: '
-                'This is a warning\n'
+                'This is a warning\n\n'
                 '       Backtrace:\n'
                 '       \tstdin:1, in function `returns_warning`\n'
                 '       \tstdin:1\n'
@@ -1040,7 +1040,8 @@ def test_warning(self):
 
     def test_error(self):
         with assert_raises_compile_error(
-                'Error: error in C function returns_error: This is an error\n'
+                'Error: error in C function returns_error: '
+                'This is an error\n\n'
                 '       Backtrace:\n'
                 '       \tstdin:1, in function `returns_error`\n'
                 '       \tstdin:1\n'
@@ -1064,7 +1065,7 @@ def test_returns_unknown_object(self):
                 '       - dict\n'
                 '       - SassMap\n'
                 '       - SassWarning\n'
-                '       - SassError\n\n'
+                '       - SassError\n\n\n'
                 '       Backtrace:\n'
                 '       \tstdin:1, in function `returns_unknown`\n'
                 '       \tstdin:1\n'
