Commit bc3667ab authored by Stefan Behnel's avatar Stefan Behnel

merge 0.21.x branch into master

parents dba0a5f0 ea071f25
...@@ -24,26 +24,15 @@ cdef extern from *: ...@@ -24,26 +24,15 @@ cdef extern from *:
cdef cppclass string "{{type}}": cdef cppclass string "{{type}}":
char* data() char* data()
size_t size() size_t size()
cdef object __Pyx_PyObject_FromStringAndSize(char*, size_t)
cdef object __Pyx_PyBytes_FromStringAndSize(char*, size_t)
cdef object __Pyx_PyByteArray_FromStringAndSize(char*, size_t)
cdef object __Pyx_PyUnicode_FromStringAndSize(char*, size_t)
@cname("{{cname}}") {{for py_type in ['PyObject', 'PyUnicode', 'PyStr', 'PyBytes', 'PyByteArray']}}
cdef inline object {{cname}}(const string& s): cdef extern from *:
return __Pyx_PyObject_FromStringAndSize(s.data(), s.size()) cdef object __Pyx_{{py_type}}_FromStringAndSize(char*, size_t)
@cname("{{cname.replace("PyObject", "PyUnicode", 1)}}")
cdef inline object {{cname.replace("PyObject", "PyUnicode", 1)}}(const string& s):
return __Pyx_PyUnicode_FromStringAndSize(s.data(), s.size())
@cname("{{cname.replace("PyObject", "PyBytes", 1)}}")
cdef inline object {{cname.replace("PyObject", "PyBytes", 1)}}(const string& s):
return __Pyx_PyBytes_FromStringAndSize(s.data(), s.size())
@cname("{{cname.replace("PyObject", "PyByteArray", 1)}}") @cname("{{cname.replace("PyObject", py_type, 1)}}")
cdef inline object {{cname.replace("PyObject", "PyByteArray", 1)}}(const string& s): cdef inline object {{cname.replace("PyObject", py_type, 1)}}(const string& s):
return __Pyx_PyByteArray_FromStringAndSize(s.data(), s.size()) return __Pyx_{{py_type}}_FromStringAndSize(s.data(), s.size())
{{endfor}}
#################### vector.from_py #################### #################### vector.from_py ####################
......
...@@ -7,11 +7,8 @@ cimport cython ...@@ -7,11 +7,8 @@ cimport cython
from libcpp.string cimport string from libcpp.string cimport string
b_asdf = b'asdf' b_asdf = b'asdf'
b_asdg = b'asdg' s_asdf = 'asdf'
b_s = b's'
u_asdf = u'asdf' u_asdf = u'asdf'
u_asdg = u'asdg'
u_s = u's' u_s = u's'
...@@ -138,3 +135,16 @@ def test_unicode_cast(a): ...@@ -138,3 +135,16 @@ def test_unicode_cast(a):
cdef string s = a cdef string s = a
assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a)) assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
return <unicode>s return <unicode>s
def test_str_cast(a):
"""
>>> s = test_str_cast(b'abc')
>>> type(s) is type(s_asdf) or type(s)
True
>>> print(s)
abc
"""
cdef string s = a
assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
return <str>s
# mode: run
# tag: cpp
# cython: c_string_encoding=ascii, c_string_type=str
cimport cython
from libcpp.string cimport string
b_asdf = b'asdf'
u_asdf = u'asdf'
s_asdf = 'asdf'
s_s = 's'
def test_conversion(py_obj):
"""
>>> test_conversion(b_asdf) == s_asdf or test_conversion(b_asdf)
True
>>> test_conversion(u_asdf) == s_asdf or test_conversion(u_asdf)
True
>>> test_conversion(123) # doctest: +ELLIPSIS
Traceback (most recent call last):
TypeError: expected ..., int found
"""
cdef string s = py_obj
assert <size_t>len(py_obj) == s.length(), '%d != %d' % (len(py_obj), s.length())
return s
def test_empty(py_obj):
"""
>>> test_empty('')
True
>>> test_empty('abc')
False
>>> test_empty(u_asdf[:0])
True
>>> test_empty(u_asdf)
False
"""
cdef string a = py_obj
return a.empty()
def test_push_back(a):
"""
>>> test_push_back(b_asdf) == s_asdf + s_s
True
>>> test_push_back(u_asdf) == s_asdf + s_s
True
"""
cdef string s = a
s.push_back(<char>ord('s'))
return s
def test_clear(a):
"""
>>> test_clear(u_asdf) == s_s[:0]
True
>>> test_clear(b_asdf) == s_s[:0]
True
"""
cdef string s = a
s.clear()
return s
def test_assign(char *a):
"""
>>> test_assign(b_asdf) == 'ggg'
True
"""
cdef string s = string(a)
s.assign(<char *>"ggg")
return s.c_str()
def test_bytes_cast(a):
"""
>>> b = test_bytes_cast(b'abc')
>>> isinstance(b, bytes)
True
>>> print(b.decode('ascii'))
abc
>>> b = test_bytes_cast(b'abc\\xe4\\xfc')
>>> isinstance(b, bytes)
True
>>> len(b)
5
>>> print(b[:3].decode('ascii'))
abc
>>> print(ord(b[3:4]))
228
>>> print(ord(b[4:5]))
252
"""
cdef string s = a
assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
return <bytes>s
def test_bytearray_cast(a):
"""
>>> b = test_bytearray_cast(b'abc')
>>> isinstance(b, bytearray)
True
>>> print(b.decode('ascii'))
abc
>>> b = test_bytearray_cast(b'abc\\xe4\\xfc')
>>> isinstance(b, bytearray)
True
>>> len(b)
5
>>> print(b[:3].decode('ascii'))
abc
>>> print(ord(b[3:4]))
228
>>> print(ord(b[4:5]))
252
"""
cdef string s = a
assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
return <bytearray>s
def test_unicode_cast(a):
"""
>>> u = test_unicode_cast(b'abc')
>>> type(u) is type(u_asdf) or type(u)
True
>>> print(u)
abc
"""
cdef string s = a
assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
return <unicode>s
def test_str_cast(a):
"""
>>> s = test_str_cast(b'abc')
>>> type(s) is type(s_asdf) or type(s)
True
>>> print(s)
abc
"""
cdef string s = a
assert s.length() == <size_t>len(a), "%d != %d" % (s.length(), len(a))
return <str>s
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