From 58d34fb0811ddb8cf4c700cf49654e85b4e01af7 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 1 May 2015 19:07:44 -0700 Subject: [PATCH 1/2] Upgrade to 3.2.1 --- libsass | 2 +- sasstests.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libsass b/libsass index 20d88709..e716caa9 160000 --- a/libsass +++ b/libsass @@ -1 +1 @@ -Subproject commit 20d887093075b4d219df441acca19e40ee765740 +Subproject commit e716caa918d86b3b8598e8ad639943fe6ec8e0ec diff --git a/sasstests.py b/sasstests.py index 16d5d8f5..bc2f45af 100644 --- 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' From d7ea72f155b522aa2dfe76c4c56b965f0f90995c Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 1 May 2015 19:08:41 -0700 Subject: [PATCH 2/2] 3.2.2 --- libsass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsass b/libsass index e716caa9..66631c07 160000 --- a/libsass +++ b/libsass @@ -1 +1 @@ -Subproject commit e716caa918d86b3b8598e8ad639943fe6ec8e0ec +Subproject commit 66631c07ba6e2ff2f740924369114ab9248f168d