Commit 12172b4a authored by Stefan Behnel's avatar Stefan Behnel

Merge branch 'master' of git+ssh://github.com/cython/cython

parents 77693c53 da1d5bb6
...@@ -122,6 +122,10 @@ def file_hash(filename): ...@@ -122,6 +122,10 @@ def file_hash(filename):
def parse_list(s): def parse_list(s):
""" """
>>> parse_list("")
[]
>>> parse_list("a")
['a']
>>> parse_list("a b c") >>> parse_list("a b c")
['a', 'b', 'c'] ['a', 'b', 'c']
>>> parse_list("[a, b, c]") >>> parse_list("[a, b, c]")
...@@ -131,7 +135,7 @@ def parse_list(s): ...@@ -131,7 +135,7 @@ def parse_list(s):
>>> parse_list('[a, ",a", "a,", ",", ]') >>> parse_list('[a, ",a", "a,", ",", ]')
['a', ',a', 'a,', ','] ['a', ',a', 'a,', ',']
""" """
if s[0] == '[' and s[-1] == ']': if len(s) >= 2 and s[0] == '[' and s[-1] == ']':
s = s[1:-1] s = s[1:-1]
delimiter = ',' delimiter = ','
else: else:
......
...@@ -2062,7 +2062,7 @@ proto=""" ...@@ -2062,7 +2062,7 @@ proto="""
#endif #endif
#if defined(__cplusplus) && CYTHON_CCOMPLEX \ #if defined(__cplusplus) && CYTHON_CCOMPLEX \
&& (defined(_WIN32) || defined(__clang__) || (defined(__GNUC__) && GCC_VERSION >= 40400) || __cplusplus >= 201103) && (defined(_WIN32) || defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 5 || __GNUC__ == 4 && __GNUC_MINOR__ >= 4 )) || __cplusplus >= 201103)
#define __Pyx_SET_CREAL(z,x) ((z).real(x)) #define __Pyx_SET_CREAL(z,x) ((z).real(x))
#define __Pyx_SET_CIMAG(z,y) ((z).imag(y)) #define __Pyx_SET_CIMAG(z,y) ((z).imag(y))
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment