diff options
| -rw-r--r-- | scss/namespace.py | 13 | ||||
| -rw-r--r-- | scss/src/_speedups.c | 18 | ||||
| -rw-r--r-- | scss/src/scanner.c | 7 | ||||
| -rw-r--r-- | scss/src/scanner.h | 9 | ||||
| -rw-r--r-- | scss/types.py | 5 | ||||
| -rw-r--r-- | setup.py | 2 |
6 files changed, 35 insertions, 19 deletions
diff --git a/scss/namespace.py b/scss/namespace.py index 939cde5..dab3aea 100644 --- a/scss/namespace.py +++ b/scss/namespace.py @@ -169,9 +169,16 @@ class Namespace(object): def _auto_register_function(self, function, name, ignore_args=0): name = name.replace('_', '-').rstrip('-') - argspec = inspect.getargspec(function) - - if argspec.varargs or argspec.keywords: + try: + argspec = inspect.getfullargspec(function) + varkw = argspec.varkw + except AttributeError: + # In python 2.7, getfulargspec does not exist. + # Let's use getargspec as fallback. + argspec = inspect.getargspec(function) + varkw = argspec.keywords + + if argspec.varargs or varkw: # Accepts some arbitrary number of arguments arities = [None] else: diff --git a/scss/src/_speedups.c b/scss/src/_speedups.c index 1244b29..5c4ed93 100644 --- a/scss/src/_speedups.c +++ b/scss/src/_speedups.c @@ -8,6 +8,7 @@ * MIT license (http://www.opensource.org/licenses/mit-license.php) * Copyright (c) 2011 German M. Bravo (Kronuz), All rights reserved. */ +#define PY_SSIZE_T_CLEAN #include <Python.h> #include "py3defs.h" #include "block_locator.h" @@ -22,7 +23,7 @@ typedef struct { } scss_BlockLocator; static char* -scss_pyunicode_to_utf8(PyObject* obj, int* len) +scss_pyunicode_to_utf8(PyObject* obj, Py_ssize_t* len) { char* internal_buffer; char* ret; @@ -188,7 +189,8 @@ scss_Scanner_token(scss_Scanner *self, PyObject *args) PyObject *py_token; char *tok; - int token_num, len; + int token_num; + Py_ssize_t len; PyObject *restrictions = NULL; Hashtable *_restrictions = NULL; @@ -272,7 +274,7 @@ static PyObject * scss_Scanner_reset(scss_Scanner *self, PyObject *args, PyObject *kwds) { char *input = NULL; - int input_sz = 0; + Py_ssize_t input_sz = 0; if (self->scanner != NULL) { if (PyArg_ParseTuple(args, "|z#", &input, &input_sz)) { @@ -289,11 +291,11 @@ scss_Scanner_setup_patterns(PyObject *self, PyObject *patterns) { PyObject *item, *item0, *item1; int i, is_tuple, _is_tuple; - long size; + Py_ssize_t size; Pattern *_patterns = NULL; int patterns_sz = 0; - int len; + Py_ssize_t len; if (!Scanner_initialized()) { is_tuple = PyTuple_Check(patterns); if (is_tuple || PyList_Check(patterns)) { @@ -325,17 +327,17 @@ scss_Scanner_init(scss_Scanner *self, PyObject *args, PyObject *kwds) { PyObject *item, *item0, *item1; int i, is_tuple, _is_tuple; - long size; + Py_ssize_t size; PyObject *patterns, *ignore; Pattern *_patterns = NULL; int patterns_sz = 0; - int len; + Py_ssize_t len; Pattern *_ignore = NULL; int ignore_sz = 0; PyObject *py_input = NULL; char *encoded_input = NULL; - int encoded_input_sz = 0; + Py_ssize_t encoded_input_sz = 0; self->scanner = NULL; diff --git a/scss/src/scanner.c b/scss/src/scanner.c index a65ed37..40e5373 100644 --- a/scss/src/scanner.c +++ b/scss/src/scanner.c @@ -8,6 +8,7 @@ * MIT license (http://www.opensource.org/licenses/mit-license.php) * Copyright (c) 2011 German M. Bravo (Kronuz), All rights reserved. */ +#define PY_SSIZE_T_CLEAN #include <Python.h> #include <stdio.h> @@ -50,7 +51,7 @@ Pattern_regex(char *tok, char *expr) { } static int -Pattern_match(Pattern *regex, char *string, int string_sz, int start_at, Token *p_token) { +Pattern_match(Pattern *regex, char *string, Py_ssize_t string_sz, int start_at, Token *p_token) { int options = PCRE_ANCHORED | PCRE_UTF8; const char *errptr; int ret, erroffset, ovector[3]; @@ -243,7 +244,7 @@ _Scanner_scan(Scanner *self, Hashtable *restrictions) /* Scanner public interface */ void -Scanner_reset(Scanner *self, char *input, int input_sz) { +Scanner_reset(Scanner *self, char *input, Py_ssize_t input_sz) { int i; #ifdef DEBUG @@ -290,7 +291,7 @@ Scanner_del(Scanner *self) { } Scanner* -Scanner_new(Pattern patterns[], int patterns_sz, Pattern ignore[], int ignore_sz, char *input, int input_sz) +Scanner_new(Pattern patterns[], int patterns_sz, Pattern ignore[], int ignore_sz, char *input, Py_ssize_t input_sz) { int i; size_t len; diff --git a/scss/src/scanner.h b/scss/src/scanner.h index ae63f5c..9c60ae7 100644 --- a/scss/src/scanner.h +++ b/scss/src/scanner.h @@ -11,6 +11,9 @@ #ifndef SCANNER_H #define SCANNER_H +#define PY_SSIZE_T_CLEAN +#include <Python.h> + #include "hashtable.h" #define PCRE_STATIC @@ -50,7 +53,7 @@ typedef struct { int tokens_bsz; Token *tokens; Restriction *restrictions; - int input_sz; + Py_ssize_t input_sz; char *input; int pos; } Scanner; @@ -59,8 +62,8 @@ int Scanner_initialized(void); void Scanner_initialize(Pattern *, int); void Scanner_finalize(void); -void Scanner_reset(Scanner *self, char *input, int input_sz); -Scanner *Scanner_new(Pattern *, int, Pattern *, int, char *, int); +void Scanner_reset(Scanner *self, char *input, Py_ssize_t input_sz); +Scanner *Scanner_new(Pattern *, int, Pattern *, int, char *, Py_ssize_t); void Scanner_del(Scanner *); Token* Scanner_token(Scanner *, int, Hashtable *restrictions); diff --git a/scss/types.py b/scss/types.py index c35905a..acaf72c 100644 --- a/scss/types.py +++ b/scss/types.py @@ -3,7 +3,10 @@ from __future__ import division from __future__ import print_function from __future__ import unicode_literals -from collections import Iterable +try: + from collections.abc import Iterable +except ImportError: + from collections import Iterable import colorsys from fractions import Fraction import operator @@ -17,7 +17,7 @@ with open('scss/scss_meta.py', 'rb') as f: install_requires = ['six'] if sys.version_info < (3, 4): install_requires.append('enum34') - install_requires.append('pathlib') + install_requires.append('pathlib2') if sys.version_info < (2, 7): install_requires.append('ordereddict') |