Merge pull request #60 from Eksmo/feature/freebsd_support

Fix problem compiling package under FreeBSD

Author: dahlia

libsass

@@ -35,18 +35,6 @@ static union Sass_Value* _error_to_sass_value(PyObject* value);
 static union Sass_Value* _unknown_type_to_sass_error(PyObject* value);
 static union Sass_Value* _exception_to_sass_error();
 
-struct PySass_Pair {
-    char *label;
-    int value;
-};
-
-static struct PySass_Pair PySass_output_style_enum[] = {
-    {(char *) "nested", SASS_STYLE_NESTED},
-    {(char *) "expanded", SASS_STYLE_EXPANDED},
-    {(char *) "compact", SASS_STYLE_COMPACT},
-    {(char *) "compressed", SASS_STYLE_COMPRESSED},
-    {NULL}
-};
 
 static PyObject* _to_py_value(const union Sass_Value* value) {
     PyObject* retv = NULL;
@@ -362,10 +350,12 @@ static union Sass_Value* _to_sass_value(PyObject* value) {
 }
 
 static union Sass_Value* _call_py_f(
-        const union Sass_Value* sass_args, void* cookie
+        const union Sass_Value* sass_args,
+        Sass_Function_Entry cb,
+        struct Sass_Options* opts
 ) {
     size_t i;
-    PyObject* pyfunc = (PyObject*)cookie;
+    PyObject* pyfunc = (PyObject*)sass_function_get_cookie(cb);
     PyObject* py_args = PyTuple_New(sass_list_get_length(sass_args));
     PyObject* py_result = NULL;
     union Sass_Value* sass_result = NULL;
@@ -394,13 +384,13 @@ static void _add_custom_functions(
         struct Sass_Options* options, PyObject* custom_functions
 ) {
     Py_ssize_t i;
-    Sass_C_Function_List fn_list = sass_make_function_list(
+    Sass_Function_List fn_list = sass_make_function_list(
         PyList_Size(custom_functions)
     );
     for (i = 0; i < PyList_GET_SIZE(custom_functions); i += 1) {
         PyObject* sass_function = PyList_GET_ITEM(custom_functions, i);
         PyObject* signature = PySass_Object_Bytes(sass_function);
-        Sass_C_Function_Callback fn = sass_make_function(
+        Sass_Function_Entry fn = sass_make_function(
             PySass_Bytes_AS_STRING(signature),
             _call_py_f,
             sass_function
@@ -415,27 +405,26 @@ PySass_compile_string(PyObject *self, PyObject *args) {
     struct Sass_Context *ctx;
     struct Sass_Data_Context *context;
     struct Sass_Options *options;
-    char *string, *include_paths, *image_path;
+    char *string, *include_paths;
     const char *error_message, *output_string;
     Sass_Output_Style output_style;
     int source_comments, error_status, precision;
     PyObject *custom_functions;
     PyObject *result;
 
     if (!PyArg_ParseTuple(args,
-                          PySass_IF_PY3("yiiyyiO", "siissiO"),
+                          PySass_IF_PY3("yiiyiO", "siisiO"),
                           &string, &output_style, &source_comments,
-                          &include_paths, &image_path, &precision,
+                          &include_paths, &precision,
                           &custom_functions)) {
         return NULL;
     }
 
-    context = sass_make_data_context(string);
+    context = sass_make_data_context(strdup(string));
     options = sass_data_context_get_options(context);
     sass_option_set_output_style(options, output_style);
     sass_option_set_source_comments(options, source_comments);
     sass_option_set_include_path(options, include_paths);
-    sass_option_set_image_path(options, image_path);
     sass_option_set_precision(options, precision);
     _add_custom_functions(options, custom_functions);
 
@@ -459,16 +448,16 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
     struct Sass_Context *ctx;
     struct Sass_File_Context *context;
     struct Sass_Options *options;
-    char *filename, *include_paths, *image_path;
+    char *filename, *include_paths;
     const char *error_message, *output_string, *source_map_string;
     Sass_Output_Style output_style;
     int source_comments, error_status, precision;
     PyObject *source_map_filename, *custom_functions, *result;
 
     if (!PyArg_ParseTuple(args,
-                          PySass_IF_PY3("yiiyyiOO", "siissiOO"),
+                          PySass_IF_PY3("yiiyiOO", "siisiOO"),
                           &filename, &output_style, &source_comments,
-                          &include_paths, &image_path, &precision,
+                          &include_paths, &precision,
                           &source_map_filename, &custom_functions)) {
         return NULL;
     }
@@ -491,7 +480,6 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
     sass_option_set_output_style(options, output_style);
     sass_option_set_source_comments(options, source_comments);
     sass_option_set_include_path(options, include_paths);
-    sass_option_set_image_path(options, image_path);
     sass_option_set_precision(options, precision);
     _add_custom_functions(options, custom_functions);
 
@@ -522,22 +510,17 @@ static PyMethodDef PySass_methods[] = {
 
 static char PySass_doc[] = "The thin binding of libsass for Python.";
 
-void PySass_make_enum_dict(PyObject *enum_dict, struct PySass_Pair *pairs) {
-    size_t i;
-    for (i = 0; pairs[i].label; ++i) {
-        PyDict_SetItemString(
-            enum_dict,
-            pairs[i].label,
-            PySass_Int_FromLong((long) pairs[i].value)
-        );
-    }
+PyObject* PySass_make_enum_dict() {
+    PyObject* dct = PyDict_New();
+    PyDict_SetItemString(dct, "nested", PySass_Int_FromLong(SASS_STYLE_NESTED));
+    PyDict_SetItemString(dct, "expected", PySass_Int_FromLong(SASS_STYLE_EXPANDED));
+    PyDict_SetItemString(dct, "compact", PySass_Int_FromLong(SASS_STYLE_COMPACT));
+    PyDict_SetItemString(dct, "compressed", PySass_Int_FromLong(SASS_STYLE_COMPRESSED));
+    return dct;
 }
 
 void PySass_init_module(PyObject *module) {
-    PyObject *output_styles;
-    output_styles = PyDict_New();
-    PySass_make_enum_dict(output_styles, PySass_output_style_enum);
-    PyModule_AddObject(module, "OUTPUT_STYLES", output_styles);
+    PyModule_AddObject(module, "OUTPUT_STYLES", PySass_make_enum_dict());
 }
 
 #if PY_MAJOR_VERSION >= 3

pysass.cpp

@@ -144,12 +144,13 @@ def __str__(self):
 
 def compile_dirname(
     search_path, output_path, output_style, source_comments, include_paths,
-    image_path, precision, custom_functions,
+    precision, custom_functions,
 ):
     fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
     for dirpath, _, filenames in os.walk(search_path):
         filenames = [
-            filename for filename in filenames if filename.endswith('.scss')
+            filename for filename in filenames
+            if filename.endswith('.scss') and not filename.startswith('_')
         ]
         for filename in filenames:
             input_filename = os.path.join(dirpath, filename)
@@ -159,7 +160,7 @@ def compile_dirname(
             input_filename = input_filename.encode(fs_encoding)
             s, v, _ = compile_filename(
                 input_filename, output_style, source_comments, include_paths,
-                image_path, precision, None, custom_functions,
+                precision, None, custom_functions,
             )
             if s:
                 v = v.decode('UTF-8')
@@ -192,8 +193,6 @@ def compile(**kwargs):
     :param include_paths: an optional list of paths to find ``@import``\ ed
                           SASS/CSS source files
     :type include_paths: :class:`collections.Sequence`, :class:`str`
-    :param image_path: an optional path to find images
-    :type image_path: :class:`str`
     :param precision: optional precision for numbers. :const:`5` by default.
     :type precision: :class:`int`
     :param custom_functions: optional mapping of custom functions.
@@ -229,8 +228,6 @@ def compile(**kwargs):
     :param include_paths: an optional list of paths to find ``@import``\ ed
                           SASS/CSS source files
     :type include_paths: :class:`collections.Sequence`, :class:`str`
-    :param image_path: an optional path to find images
-    :type image_path: :class:`str`
     :param precision: optional precision for numbers. :const:`5` by default.
     :type precision: :class:`int`
     :param custom_functions: optional mapping of custom functions.
@@ -269,8 +266,6 @@ def compile(**kwargs):
     :param include_paths: an optional list of paths to find ``@import``\ ed
                           SASS/CSS source files
     :type include_paths: :class:`collections.Sequence`, :class:`str`
-    :param image_path: an optional path to find images
-    :type image_path: :class:`str`
     :param precision: optional precision for numbers. :const:`5` by default.
     :type precision: :class:`int`
     :param custom_functions: optional mapping of custom functions.
@@ -424,16 +419,6 @@ def func_name(a, b):
                             'Windows) string, not ' + repr(include_paths))
         if isinstance(include_paths, text_type):
             include_paths = include_paths.encode(fs_encoding)
-    try:
-        image_path = kwargs.pop('image_path')
-    except KeyError:
-        image_path = b'.'
-    else:
-        if not isinstance(image_path, string_types):
-            raise TypeError('image_path must be a string, not ' +
-                            repr(image_path))
-        elif isinstance(image_path, text_type):
-            image_path = image_path.encode(fs_encoding)
 
     custom_functions = kwargs.pop('custom_functions', ())
     if isinstance(custom_functions, collections.Mapping):
@@ -460,10 +445,10 @@ def func_name(a, b):
         string = kwargs.pop('string')
         if isinstance(string, text_type):
             string = string.encode('utf-8')
-        s, v = compile_string(string,
-                              output_style, source_comments,
-                              include_paths, image_path, precision,
-                              custom_functions)
+        s, v = compile_string(
+            string, output_style, source_comments, include_paths, precision,
+            custom_functions,
+        )
         if s:
             return v.decode('utf-8')
     elif 'filename' in modes:
@@ -475,10 +460,8 @@ def func_name(a, b):
         elif isinstance(filename, text_type):
             filename = filename.encode(fs_encoding)
         s, v, source_map = compile_filename(
-            filename,
-            output_style, source_comments,
-            include_paths, image_path, precision, source_map_filename,
-            custom_functions,
+            filename, output_style, source_comments, include_paths, precision,
+            source_map_filename, custom_functions,
         )
         if s:
             v = v.decode('utf-8')
@@ -522,10 +505,8 @@ def func_name(a, b):
             raise ValueError('dirname must be a pair of (source_dir, '
                              'output_dir)')
         s, v = compile_dirname(
-            search_path, output_path,
-            output_style, source_comments,
-            include_paths, image_path, precision,
-            custom_functions,
+            search_path, output_path, output_style, source_comments,
+            include_paths, precision, custom_functions,
         )
         if s:
             return

sass.py

@@ -21,10 +21,6 @@
    Optional directory path to find ``@import``\ ed (S)CSS files.
    Can be multiply used.
 
-.. option:: -i <dir>, --image-path <dir>
-
-   Path to find images.  Default is the current directory (:file:`./`).
-
 .. option:: -m, -g, --sourcemap
 
    Emit source map.  Requires the second argument (output CSS filename).
@@ -88,8 +84,6 @@ def main(argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
                       dest='include_paths', action='append',
                       help='Path to find "@import"ed (S)CSS source files.  '
                            'Can be multiply used.')
-    parser.add_option('-i', '--image-path', metavar='DIR', default='./',
-                      help='Path to find images. [default: %default]')
     parser.add_option('-w', '--watch', action='store_true',
                       help='Watch file for changes.  Requires the second '
                            'argument (output css filename).')
@@ -130,7 +124,6 @@ def main(argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
                     output_style=options.output_style,
                     source_map_filename=source_map_filename,
                     include_paths=options.include_paths,
-                    image_path=options.image_path,
                     precision=options.precision
                 )
             else:
@@ -140,7 +133,6 @@ def main(argv=sys.argv, stdout=sys.stdout, stderr=sys.stderr):
                     filename=filename,
                     output_style=options.output_style,
                     include_paths=options.include_paths,
-                    image_path=options.image_path,
                     precision=options.precision
                 )
         except (IOError, OSError) as e: