Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-11-03 19:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-0.4'

Browse source
This commit is contained in:
INADA Naoki 2016-07-21 19:33:49 +09:00
commit 83e7b0aeac
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
appveyor.yml
View file

@ -13,10 +13,7 @@ environment:
- PYTHON: "C:\\Python27-x64" - PYTHON: "C:\\Python27-x64"
- PYTHON: "C:\\Python34-x64" - PYTHON: "C:\\Python34-x64"
DISTUTILS_USE_SDK: "1" DISTUTILS_USE_SDK: "1"
- PYTHON: "C:\\Python35-x64"
# Python35-x64 test fails with MemoryError
# TODO: investigate it
#- PYTHON: "C:\\Python35-x64"
install: install:
# We need wheel installed to build wheels # We need wheel installed to build wheels

4
msgpack/unpack.h
View file

@ -265,9 +265,9 @@ static inline int unpack_callback_ext(unpack_user* u, const char* base, const ch
} }
// length also includes the typecode, so the actual data is length-1 // length also includes the typecode, so the actual data is length-1
#if PY_MAJOR_VERSION == 2 #if PY_MAJOR_VERSION == 2
py = PyObject_CallFunction(u->ext_hook, "(is#)", typecode, pos, length-1); py = PyObject_CallFunction(u->ext_hook, "(is#)", (int)typecode, pos, (Py_ssize_t)length-1);
#else #else
py = PyObject_CallFunction(u->ext_hook, "(iy#)", typecode, pos, length-1); py = PyObject_CallFunction(u->ext_hook, "(iy#)", (int)typecode, pos, (Py_ssize_t)length-1);
#endif #endif
if (!py) if (!py)
return -1; return -1;

2
setup.py
View file

@ -21,7 +21,7 @@ except ImportError:
def cythonize(src): def cythonize(src):
sys.stderr.write("cythonize: %r\n" % (src,)) sys.stderr.write("cythonize: %r\n" % (src,))
cython_compiler.compile([src], cplus=True, emit_linenums=True) cython_compiler.compile([src], cplus=True)
def ensure_source(src): def ensure_source(src):
pyx = os.path.splitext(src)[0] + '.pyx' pyx = os.path.splitext(src)[0] + '.pyx'