support custom import extension, fix #245

Author: samuelcolvin

pysass.cpp

@@ -505,6 +505,17 @@ static void _add_custom_importers(
     sass_option_set_c_importers(options, importer_list);
 }
 
+static void _add_custom_import_extensions(
+        struct Sass_Options* options, PyObject* custom_import_extensions
+) {
+    Py_ssize_t i;
+
+    for (i = 0; i < PyList_GET_SIZE(custom_import_extensions); i += 1) {
+        PyObject* ext = PyList_GET_ITEM(custom_import_extensions, i);
+        sass_option_push_import_extension(options, PyBytes_AS_STRING(ext));
+    }
+}
+
 static PyObject *
 PySass_compile_string(PyObject *self, PyObject *args) {
     struct Sass_Context *ctx;
@@ -516,13 +527,15 @@ PySass_compile_string(PyObject *self, PyObject *args) {
     int source_comments, error_status, precision, indented;
     PyObject *custom_functions;
     PyObject *custom_importers;
+    PyObject *custom_import_extensions;
     PyObject *result;
 
     if (!PyArg_ParseTuple(args,
-                          PySass_IF_PY3("yiiyiOiO", "siisiOiO"),
+                          PySass_IF_PY3("yiiyiOiOO", "siisiOiOO"),
                           &string, &output_style, &source_comments,
                           &include_paths, &precision,
-                          &custom_functions, &indented, &custom_importers)) {
+                          &custom_functions, &indented, &custom_importers,
+                          &custom_import_extensions)) {
         return NULL;
     }
 
@@ -535,6 +548,7 @@ 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);
+    _add_custom_import_extensions(options, custom_import_extensions);
     sass_compile_data_context(context);
 
     ctx = sass_data_context_get_context(context);
@@ -560,14 +574,15 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
     Sass_Output_Style output_style;
     int source_comments, error_status, precision;
     PyObject *source_map_filename, *custom_functions, *custom_importers,
-             *result, *output_filename_hint;
+             *result, *output_filename_hint, *custom_import_extensions;
 
     if (!PyArg_ParseTuple(args,
-                          PySass_IF_PY3("yiiyiOOOO", "siisiOOOO"),
+                          PySass_IF_PY3("yiiyiOOOOO", "siisiOOOOO"),
                           &filename, &output_style, &source_comments,
                           &include_paths, &precision,
                           &source_map_filename, &custom_functions,
-                          &custom_importers, &output_filename_hint)) {
+                          &custom_importers, &output_filename_hint,
+                          &custom_import_extensions)) {
         return NULL;
     }
 
@@ -594,6 +609,7 @@ 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);
+    _add_custom_import_extensions(options, custom_import_extensions);
     sass_compile_file_context(context);
 
     ctx = sass_file_context_get_context(context);

sass.py

@@ -239,7 +239,7 @@ def compile_dirname(
             input_filename = input_filename.encode(fs_encoding)
             s, v, _ = _sass.compile_filename(
                 input_filename, output_style, source_comments, include_paths,
-                precision, None, custom_functions, importers, None,
+                precision, None, custom_functions, importers, None, [],
             )
             if s:
                 v = v.decode('UTF-8')
@@ -584,6 +584,21 @@ def _get_file_arg(key):
             'not {1!r}'.format(SassFunction, custom_functions)
         )
 
+    _custom_exts = kwargs.pop('custom_import_extensions', []) or []
+    if isinstance(_custom_exts, (text_type, bytes)):
+        _custom_exts = [_custom_exts]
+    custom_import_extensions = []
+    for ext in _custom_exts:
+        if isinstance(ext, text_type):
+            custom_import_extensions.append(ext.encode('utf-8'))
+        elif isinstance(ext, bytes):
+            custom_import_extensions.append(ext)
+        else:
+            raise TypeError(
+                'custom_import_extensions must be a list of strings '
+                'or bytes not {}'.format(type(ext))
+            )
+
     importers = _validate_importers(kwargs.pop('importers', None))
 
     if 'string' in modes:
@@ -597,7 +612,7 @@ def _get_file_arg(key):
         _check_no_remaining_kwargs(compile, kwargs)
         s, v = _sass.compile_string(
             string, output_style, source_comments, include_paths, precision,
-            custom_functions, indented, importers,
+            custom_functions, indented, importers, custom_import_extensions,
         )
         if s:
             return v.decode('utf-8')
@@ -613,7 +628,7 @@ def _get_file_arg(key):
         s, v, source_map = _sass.compile_filename(
             filename, output_style, source_comments, include_paths, precision,
             source_map_filename, custom_functions, importers,
-            output_filename_hint,
+            output_filename_hint, custom_import_extensions,
         )
         if s:
             v = v.decode('utf-8')

sasstests.py

@@ -1409,3 +1409,55 @@ def test_imports_from_cwd(tmpdir):
     with tmpdir.as_cwd():
         out = sass.compile(filename=main_scss.strpath)
         assert out == ''
+
+
+@pytest.mark.parametrize('exts', [
+    '.css',
+    ('.css',),
+    ['.css'],
+    b'.css',
+    [b'.css'],
+    ['.foobar', '.css'],
+    ['.foobar', '.css', b'anything'],
+])
+def test_import_css(exts, tmpdir):
+    tmpdir.join('other.css').write('body {colour: green}')
+    main_scss = tmpdir.join('main.scss')
+    main_scss.write("@import 'other';")
+    out = sass.compile(
+        filename=main_scss.strpath,
+        custom_import_extensions=exts,
+    )
+    assert out == 'body {\n  colour: green; }\n'
+
+
+def test_import_css_string(tmpdir):
+    tmpdir.join('other.css').write('body {colour: green}')
+    with tmpdir.as_cwd():
+        out = sass.compile(
+            string="@import 'other';",
+            custom_import_extensions='.css',
+        )
+    assert out == 'body {\n  colour: green; }\n'
+
+
+def test_import_css_error(tmpdir):
+    tmpdir.join('other.css').write('body {colour: green}')
+    main_scss = tmpdir.join('main.scss')
+    main_scss.write("@import 'other';")
+    with pytest.raises(TypeError):
+        sass.compile(
+            filename=main_scss.strpath,
+            custom_import_extensions=['.css', 3],
+        )
+
+
+def test_import_ext_other(tmpdir):
+    tmpdir.join('other.foobar').write('body {colour: green}')
+    main_scss = tmpdir.join('main.scss')
+    main_scss.write("@import 'other';")
+    out = sass.compile(
+        filename=main_scss.strpath,
+        custom_import_extensions='.foobar',
+    )
+    assert out == 'body {\n  colour: green; }\n'