Skip to content

Commit

Permalink
Merge pull request #204 from dahlia/temporary_revert_3_5
Browse files Browse the repository at this point in the history 
Temporarily revert the 3.5 releases
  • Loading branch information
@asottile
asottile committed Jun 7, 2017
2 parents 0c81f53 + e3f54a2 commit 992fcde
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 40 deletions.
2 changes: 1 addition & 1 deletion libsass
Submodule libsass updated 99 files
+0 −3 .gitignore
+18 −37 .travis.yml
+2 −2 GNUmakefile.am
+5 −9 Makefile
+0 −1 Makefile.conf
+57 −60 Readme.md
+3 −7 appveyor.yml
+2 −2 configure.ac
+21 −29 docs/api-context-internal.md
+6 −26 docs/api-context.md
+15 −48 docs/api-doc.md
+1 −1 docs/api-function-example.md
+7 −31 docs/api-function.md
+19 −19 docs/api-importer.md
+1 −3 docs/api-value.md
+1 −1 docs/build-on-windows.md
+8 −10 docs/custom-functions-internal.md
+3 −0 include/sass/base.h
+2 −17 include/sass/context.h
+0 −31 include/sass/functions.h
+1 −3 include/sass/values.h
+1 −1 include/sass/version.h
+1 −1 include/sass/version.h.in
+6 −6 res/resource.rc
+4 −9 script/ci-build-libsass
+0 −62 script/ci-build-plugin
+3 −13 script/ci-report-coverage
+1 −1 src/GNUmakefile.am
+395 −384 src/ast.cpp
+321 −287 src/ast.hpp
+1 −17 src/ast_def_macros.hpp
+0 −29 src/ast_fwd_decl.cpp
+17 −84 src/ast_fwd_decl.hpp
+1 −3 src/b64/encode.h
+3 −3 src/backtrace.hpp
+25 −32 src/bind.cpp
+1 −0 src/bind.hpp
+74 −74 src/check_nesting.cpp
+3 −1 src/check_nesting.hpp
+8 −6 src/color_maps.hpp
+26 −28 src/context.cpp
+0 −1 src/context.hpp
+79 −84 src/cssize.cpp
+1 −0 src/cssize.hpp
+237 −238 src/debugger.hpp
+4 −5 src/environment.cpp
+0 −3 src/environment.hpp
+1 −9 src/error_handling.cpp
+2 −5 src/error_handling.hpp
+155 −206 src/eval.cpp
+116 −120 src/expand.cpp
+2 −0 src/expand.hpp
+281 −272 src/extend.cpp
+11 −43 src/extend.hpp
+22 −58 src/file.cpp
+3 −14 src/file.hpp
+146 −165 src/functions.cpp
+3 −2 src/functions.hpp
+29 −56 src/inspect.cpp
+1 −4 src/inspect.hpp
+1 −0 src/lexer.cpp
+4 −4 src/lexer.hpp
+2 −3 src/listize.cpp
+1 −0 src/listize.hpp
+17 −15 src/memory/SharedPtr.cpp
+43 −47 src/memory/SharedPtr.hpp
+35 −29 src/node.cpp
+8 −6 src/node.hpp
+14 −14 src/output.cpp
+253 −291 src/parser.cpp
+9 −9 src/parser.hpp
+10 −28 src/plugins.cpp
+1 −1 src/position.hpp
+2 −23 src/prelexer.cpp
+2 −6 src/prelexer.hpp
+10 −9 src/remove_placeholders.cpp
+5 −1 src/remove_placeholders.hpp
+2 −58 src/sass.cpp
+7 −33 src/sass_context.cpp
+4 −3 src/sass_context.hpp
+1 −63 src/sass_functions.cpp
+1 −19 src/sass_functions.hpp
+3 −3 src/sass_util.cpp
+4 −4 src/sass_util.hpp
+33 −35 src/sass_values.cpp
+1 −2 src/sass_values.hpp
+17 −15 src/source_map.cpp
+8 −6 src/subset_map.cpp
+6 −6 src/subset_map.hpp
+2 −2 src/to_c.cpp
+2 −0 src/to_value.cpp
+37 −39 src/units.cpp
+21 −0 src/units.hpp
+39 −44 src/util.cpp
+23 −15 src/values.cpp
+2 −13 win/libsass.sln
+0 −9 win/libsass.sln.DotSettings
+0 −1 win/libsass.targets
+0 −3 win/libsass.vcxproj.filters
9 changes: 2 additions & 7 deletions pysass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ static PyObject* _to_py_value(const union Sass_Value* value) {
size_t i = 0;
PyObject* items = PyTuple_New(sass_list_get_length(value));
PyObject* separator = sass_comma;
int is_bracketed = sass_list_get_is_bracketed(value);
PyObject* bracketed = PyBool_FromLong(is_bracketed);
switch (sass_list_get_separator(value)) {
case SASS_COMMA:
separator = sass_comma;
Expand All @@ -89,7 +87,7 @@ static PyObject* _to_py_value(const union Sass_Value* value) {
);
}
retv = PyObject_CallMethod(
types_mod, "SassList", "OOO", items, separator, bracketed
types_mod, "SassList", "OO", items, separator
);
break;
}
Expand Down Expand Up @@ -153,7 +151,6 @@ static union Sass_Value* _list_to_sass_value(PyObject* value) {
Py_ssize_t i = 0;
PyObject* items = PyObject_GetAttrString(value, "items");
PyObject* separator = PyObject_GetAttrString(value, "separator");
PyObject* bracketed = PyObject_GetAttrString(value, "bracketed");
Sass_Separator sep = SASS_COMMA;
if (separator == sass_comma) {
sep = SASS_COMMA;
Expand All @@ -162,8 +159,7 @@ static union Sass_Value* _list_to_sass_value(PyObject* value) {
} else {
assert(0);
}
int is_bracketed = bracketed == Py_True;
retv = sass_make_list(PyTuple_Size(items), sep, is_bracketed);
retv = sass_make_list(PyTuple_Size(items), sep);
for (i = 0; i < PyTuple_Size(items); i += 1) {
sass_list_set_value(
retv, i, _to_sass_value(PyTuple_GET_ITEM(items, i))
Expand All @@ -174,7 +170,6 @@ static union Sass_Value* _list_to_sass_value(PyObject* value) {
Py_DECREF(sass_space);
Py_DECREF(items);
Py_DECREF(separator);
Py_DECREF(bracketed);
return retv;
}

Expand Down
11 changes: 4 additions & 7 deletions sass.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,15 +705,12 @@ def __new__(cls, r, g, b, a):
SEPARATORS = frozenset((SASS_SEPARATOR_COMMA, SASS_SEPARATOR_SPACE))


class SassList(collections.namedtuple(
'SassList', ('items', 'separator', 'bracketed'),
)):
class SassList(collections.namedtuple('SassList', ('items', 'separator'))):

def __new__(cls, items, separator, bracketed=False):
def __new__(cls, items, separator):
items = tuple(items)
assert separator in SEPARATORS, separator
assert isinstance(bracketed, bool), bracketed
return super(SassList, cls).__new__(cls, items, separator, bracketed)
assert separator in SEPARATORS
return super(SassList, cls).__new__(cls, items, separator)


class SassError(collections.namedtuple('SassError', ('msg',))):
Expand Down
31 changes: 6 additions & 25 deletions sasstests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,12 +921,16 @@ def test_color_conversion(self):
assert type(color.a) is float, type(color.a)

def test_sass_list_no_conversion(self):
lst = sass.SassList(('foo', 'bar'), sass.SASS_SEPARATOR_COMMA)
lst = sass.SassList(
('foo', 'bar'), sass.SASS_SEPARATOR_COMMA,
)
assert type(lst.items) is tuple, type(lst.items)
assert lst.separator is sass.SASS_SEPARATOR_COMMA, lst.separator

def test_sass_list_conversion(self):
lst = sass.SassList(['foo', 'bar'], sass.SASS_SEPARATOR_SPACE)
lst = sass.SassList(
['foo', 'bar'], sass.SASS_SEPARATOR_SPACE,
)
assert type(lst.items) is tuple, type(lst.items)
assert lst.separator is sass.SASS_SEPARATOR_SPACE, lst.separator

Expand Down Expand Up @@ -1000,12 +1004,6 @@ def returns_space_list():
return sass.SassList(('medium', 'none'), sass.SASS_SEPARATOR_SPACE)


def returns_bracketed_list():
return sass.SassList(
('hello', 'ohai'), sass.SASS_SEPARATOR_SPACE, bracketed=True,
)


def returns_py_dict():
return {'foo': 'bar'}

Expand Down Expand Up @@ -1037,7 +1035,6 @@ def identity(x):
sass.SassFunction('returns_color', (), returns_color),
sass.SassFunction('returns_comma_list', (), returns_comma_list),
sass.SassFunction('returns_space_list', (), returns_space_list),
sass.SassFunction('returns_bracketed_list', (), returns_bracketed_list),
sass.SassFunction('returns_py_dict', (), returns_py_dict),
sass.SassFunction('returns_map', (), returns_map),
sass.SassFunction('identity', ('$x',), identity),
Expand All @@ -1057,7 +1054,6 @@ def identity(x):
'returns_color': returns_color,
'returns_comma_list': returns_comma_list,
'returns_space_list': returns_space_list,
'returns_bracketed_list': returns_bracketed_list,
'returns_py_dict': returns_py_dict,
'returns_map': returns_map,
'identity': identity,
Expand All @@ -1077,7 +1073,6 @@ def identity(x):
returns_color,
returns_comma_list,
returns_space_list,
returns_bracketed_list,
returns_py_dict,
returns_map,
identity,
Expand Down Expand Up @@ -1242,12 +1237,6 @@ def test_space_list(self):
'a{border-right:medium none}\n',
)

def test_bracketed_list(self):
self.assertEqual(
compile_with_func('a { content: returns_bracketed_list(); }'),
'a{content:[hello ohai]}\n'
)

def test_py_dict(self):
self.assertEqual(
compile_with_func(
Expand Down Expand Up @@ -1318,14 +1307,6 @@ def test_identity_space_list(self):
'a{border-right:medium none}\n',
)

def test_identity_bracketed_list(self):
self.assertEqual(
compile_with_func(
'a { content: identity(returns_bracketed_list()); }',
),
'a{content:[hello ohai]}\n',
)

def test_identity_py_dict(self):
self.assertEqual(
compile_with_func(
Expand Down

0 comments on commit 992fcde

Please sign in to comment.