Skip to content

Commit

Permalink
Finish implementation of custom importers
Browse files Browse the repository at this point in the history
  • Loading branch information
@asottile
asottile committed Dec 10, 2015
1 parent ea9a7c9 commit f3acec5
Show file tree
Hide file tree
Showing 4 changed files with 252 additions and 125 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ build2/libsass/cpp/%.o: libsass/src/%.cpp

build2/pysass.o: pysass.cpp
@mkdir -p build2
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses
gcc -pthread -fno-strict-aliasing -Wno-write-strings -DNDEBUG -g -fwrapv -O2 -Wall -fPIC -I./libsass/include $(PY_HEADERS) -c $^ -o $@ -c -O2 -fPIC -std=c++0x -Wall -Wno-parentheses

_sass.so: $(C_OBJECTS) $(CPP_OBJECTS) build2/pysass.o
g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro $^ -L./libsass -o $@ -fPIC -lstdc++
Expand Down
169 changes: 68 additions & 101 deletions pysass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,42 +272,7 @@ static union Sass_Value* _unknown_type_to_sass_error(PyObject* value) {
return retv;
}

static union Sass_Value* _exception_to_sass_error() {
union Sass_Value* retv = NULL;
PyObject* etype = NULL;
PyObject* evalue = NULL;
PyObject* etb = NULL;
PyErr_Fetch(&etype, &evalue, &etb);
PyErr_NormalizeException(&etype, &evalue, &etb);
{
PyObject* traceback_mod = PyImport_ImportModule("traceback");
PyObject* traceback_parts = PyObject_CallMethod(
traceback_mod, "format_exception", "OOO", etype, evalue, etb
);
PyList_Insert(traceback_parts, 0, PyUnicode_FromString("\n"));
PyObject* joinstr = PyUnicode_FromString("");
PyObject* result = PyUnicode_Join(joinstr, traceback_parts);
PyObject* bytes = PyUnicode_AsEncodedString(
result, "UTF-8", "strict"
);
retv = sass_make_error(PySass_Bytes_AS_STRING(bytes));
Py_DECREF(traceback_mod);
Py_DECREF(traceback_parts);
Py_DECREF(joinstr);
Py_DECREF(result);
Py_DECREF(bytes);
}
Py_DECREF(etype);
Py_DECREF(evalue);
Py_DECREF(etb);
return retv;
}

static PyObject* _exception_to_bytes() {
/* Grabs a Bytes instance for you to PySass_Bytes_AS_STRING.
Remember to Py_DECREF the object later!
TODO: This is a terrible violation of DRY, see above.
*/
PyObject* retv = NULL;
PyObject* etype = NULL;
PyObject* evalue = NULL;
Expand All @@ -334,6 +299,22 @@ static PyObject* _exception_to_bytes() {
return retv;
}

static union Sass_Value* _exception_to_sass_error() {
PyObject* bytes = _exception_to_bytes();
union Sass_Value* retv = sass_make_error(PySass_Bytes_AS_STRING(bytes));
Py_DECREF(bytes);
return retv;
}

static Sass_Import_List _exception_to_sass_import_error(const char* path) {
PyObject* bytes = _exception_to_bytes();
Sass_Import_List import_list = sass_make_import_list(1);
import_list[0] = sass_make_import_entry(path, 0, 0);
sass_import_set_error(import_list[0], PySass_Bytes_AS_STRING(bytes), 0, 0);
Py_DECREF(bytes);
return import_list;
}

static union Sass_Value* _to_sass_value(PyObject* value) {
union Sass_Value* retv = NULL;
PyObject* types_mod = PyImport_ImportModule("sass");
Expand Down Expand Up @@ -435,74 +416,64 @@ static void _add_custom_functions(
sass_option_set_c_functions(options, fn_list);
}

Sass_Import_List _call_py_importer_f(
const char* path,
Sass_Importer_Entry cb,
struct Sass_Compiler* comp
static Sass_Import_List _call_py_importer_f(
const char* path, Sass_Importer_Entry cb, struct Sass_Compiler* comp
) {
PyObject* pyfunc = (PyObject*)sass_importer_get_cookie(cb);
PyObject* py_path = PyUnicode_FromString(path);
PyObject* py_result = NULL;
PyObject *iterator;
PyObject *import_item;
Sass_Import_List sass_imports = NULL;
Py_ssize_t i;

py_result = PyObject_CallObject(pyfunc, PySass_IF_PY3("y", "s"), py_path);

if (!py_result) {
sass_imports = sass_make_import_list(1);
sass_imports[0] = sass_make_import_entry(path, 0, 0);

PyObject* exc = _exception_to_bytes();
char* err = PySass_Bytes_AS_STRING(exc);
py_result = PyObject_CallFunction(pyfunc, PySass_IF_PY3("y", "s"), path);

sass_import_set_error(sass_imports[0],
err,
0, 0);

Py_XDECREF(exc);
Py_XDECREF(py_result);
return sass_imports;
}
/* Handle importer throwing an exception */
if (!py_result) goto done;

/* Could return None indicating it could not handle the import */
if (py_result == Py_None) {
Py_XDECREF(py_result);
return 0;
return NULL;
}

sass_imports = sass_make_import_list(PyList_Size(py_result));

iterator = PyObject_GetIter(py_result);
while (import_item = PyIter_Next(iterator)) {
/* Otherwise, we know our importer is well formed (because we wrap it)
* The return value will be a tuple of 1, 2, or 3 tuples */
sass_imports = sass_make_import_list(PyTuple_GET_SIZE(py_result));
for (i = 0; i < PyTuple_GET_SIZE(py_result); i += 1) {
char* path_str = NULL; /* XXX: Memory leak? */
char* source_str = NULL;
char* sourcemap_str = NULL;

/* TODO: Switch statement and error handling for default case. Better way? */
if ( PyTuple_GET_SIZE(import_item) == 1 ) {
PyArg_ParseTuple(import_item, "es",
0, &path_str);
} else if ( PyTuple_GET_SIZE(import_item) == 2 ) {
PyArg_ParseTuple(import_item, "eses",
0, &path_str, 0, &source_str);
} else if ( PyTuple_GET_SIZE(import_item) == 3 ) {
PyArg_ParseTuple(import_item, "eseses",
0, &path_str, 0, &source_str, 0, &sourcemap_str);
PyObject* tup = PyTuple_GET_ITEM(py_result, i);
Py_ssize_t size = PyTuple_GET_SIZE(tup);

if (size == 1) {
PyArg_ParseTuple(tup, PySass_IF_PY3("y", "s"), &path_str);
} else if (size == 2) {
PyArg_ParseTuple(
tup, PySass_IF_PY3("yy", "ss"), &path_str, &source_str
);
} else if (size == 3) {
PyArg_ParseTuple(
tup, PySass_IF_PY3("yyy", "sss"),
&path_str, &source_str, &sourcemap_str
);
}

/* We need to give copies of these arguments; libsass handles
deallocation of them later, whereas path_str is left flapping
in the breeze -- it's treated const, so that's okay. */
if ( source_str ) source_str = strdup(source_str);
if ( sourcemap_str ) sourcemap_str = strdup(sourcemap_str);
* deallocation of them later, whereas path_str is left flapping
* in the breeze -- it's treated const, so that's okay. */
if (source_str) source_str = strdup(source_str);
if (sourcemap_str) sourcemap_str = strdup(sourcemap_str);

sass_imports[i] = sass_make_import_entry(path_str, source_str, sourcemap_str);
sass_imports[i] = sass_make_import_entry(
path_str, source_str, sourcemap_str
);
}

Py_XDECREF(import_item);
done:
if (sass_imports == NULL) {
sass_imports = _exception_to_sass_import_error(path);
}

Py_XDECREF(iterator);
Py_XDECREF(py_result);

return sass_imports;
Expand All @@ -513,26 +484,25 @@ static void _add_custom_importers(
) {
Py_ssize_t i;
Sass_Importer_List importer_list;
if ( custom_importers == Py_None ) {

if (custom_importers == Py_None) {
return;
}
importer_list = sass_make_importer_list(PyList_Size(custom_importers));
for (i = 0; i < PyList_GET_SIZE(custom_importers); i += 1) {
PyObject* item = PyList_GET_ITEM(custom_importers, i);

importer_list = sass_make_importer_list(PyTuple_GET_SIZE(custom_importers));

for (i = 0; i < PyTuple_GET_SIZE(custom_importers); i += 1) {
PyObject* item = PyTuple_GET_ITEM(custom_importers, i);
int priority = 0;
PyObject* import_function = NULL;

PyArg_ParseTuple(item, "iO",
&priority, &import_function);

importer_list[i] = sass_make_importer(_call_py_importer_f,
priority,
import_function);

PyArg_ParseTuple(item, "iO", &priority, &import_function);

importer_list[i] = sass_make_importer(
_call_py_importer_f, priority, import_function
);
}

sass_option_set_c_importers(options, importer_list);
}

Expand All @@ -548,7 +518,7 @@ PySass_compile_string(PyObject *self, PyObject *args) {
PyObject *custom_functions;
PyObject *custom_importers;
PyObject *result;

if (!PyArg_ParseTuple(args,
PySass_IF_PY3("yiiyiOiO", "siisiOiO"),
&string, &output_style, &source_comments,
Expand All @@ -566,7 +536,6 @@ PySass_compile_string(PyObject *self, PyObject *args) {
sass_option_set_is_indented_syntax_src(options, indented);
_add_custom_functions(options, custom_functions);
_add_custom_importers(options, custom_importers);

sass_compile_data_context(context);

ctx = sass_data_context_get_context(context);
Expand All @@ -578,7 +547,6 @@ PySass_compile_string(PyObject *self, PyObject *args) {
(short int) !error_status,
error_status ? error_message : output_string
);

sass_delete_data_context(context);
return result;
}
Expand All @@ -594,7 +562,7 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
int source_comments, error_status, precision;
PyObject *source_map_filename, *custom_functions, *custom_importers,
*result;

if (!PyArg_ParseTuple(args,
PySass_IF_PY3("yiiyiOOO", "siisiOOO"),
&filename, &output_style, &source_comments,
Expand Down Expand Up @@ -625,7 +593,6 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
sass_option_set_precision(options, precision);
_add_custom_functions(options, custom_functions);
_add_custom_importers(options, custom_importers);

sass_compile_file_context(context);

ctx = sass_file_context_get_context(context);
Expand Down
57 changes: 54 additions & 3 deletions sass.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from __future__ import absolute_import

import collections
import functools
import inspect
from io import open
import os
Expand Down Expand Up @@ -144,6 +145,56 @@ def __str__(self):
return self.signature


def _normalize_importer_return_value(result):
# An importer must return an iterable of iterables of 1-3 stringlike
# objects
if result is None:
return result

def _to_importer_result(single_result):
single_result = tuple(single_result)
if len(single_result) not in (1, 2, 3):
raise ValueError(
'Expected importer result to be a tuple of length (1, 2, 3) '
'but got {0}: {1!r}'.format(len(single_result), single_result)
)

def _to_bytes(obj):
if not isinstance(obj, bytes):
return obj.encode('UTF-8')
else:
return obj

return tuple(_to_bytes(s) for s in single_result)

return tuple(_to_importer_result(x) for x in result)


def _importer_callback_wrapper(func):
@functools.wraps(func)
def inner(path):
ret = func(path.decode('UTF-8'))
return _normalize_importer_return_value(ret)
return inner


def _validate_importers(importers):
"""Validates the importers and decorates the callables with our output
formatter.
"""
# They could have no importers, that's chill
if importers is None:
return None

def _to_importer(priority, func):
assert isinstance(priority, int), priority
assert callable(func), func
return (priority, _importer_callback_wrapper(func))

# Our code assumes tuple of tuples
return tuple(_to_importer(priority, func) for priority, func in importers)


def compile_dirname(
search_path, output_path, output_style, source_comments, include_paths,
precision, custom_functions, importers
Expand Down Expand Up @@ -509,7 +560,7 @@ def my_importer(path):
'not {1!r}'.format(SassFunction, custom_functions)
)

importers = kwargs.pop('importers', None)
importers = _validate_importers(kwargs.pop('importers', None))

if 'string' in modes:
string = kwargs.pop('string')
Expand Down Expand Up @@ -537,7 +588,7 @@ def my_importer(path):
_check_no_remaining_kwargs(compile, kwargs)
s, v, source_map = compile_filename(
filename, output_style, source_comments, include_paths, precision,
source_map_filename, custom_functions, importers
source_map_filename, custom_functions, importers,
)
if s:
v = v.decode('utf-8')
Expand Down Expand Up @@ -583,7 +634,7 @@ def my_importer(path):
_check_no_remaining_kwargs(compile, kwargs)
s, v = compile_dirname(
search_path, output_path, output_style, source_comments,
include_paths, precision, custom_functions, importers
include_paths, precision, custom_functions, importers,
)
if s:
return
Expand Down
Loading

0 comments on commit f3acec5

Please sign in to comment.