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

Merge extension module

Browse source 
There were `_packer.so` and `_unpacker.so`.
But single module is simpler than double module.

Merge extension module into single `_msgpack.so`.
This commit is contained in:
INADA Naoki 2018-10-03 20:55:51 +09:00 • committed by Inada Naoki
parent 91ec9e1daf
commit f6f9597249
4 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -4,7 +4,7 @@ all: cython
.PHONY: cython .PHONY: cython
cython: cython:
cython --cplus msgpack/*.pyx cython --cplus msgpack/_msgpack.pyx
.PHONY: test .PHONY: test
test: test:
@ -18,8 +18,7 @@ serve-doc: all
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf build rm -rf build
rm -f msgpack/_packer.cpp rm -f msgpack/_msgpack.cpp
rm -f msgpack/_unpacker.cpp
rm -rf msgpack/__pycache__ rm -rf msgpack/__pycache__
rm -rf test/__pycache__ rm -rf test/__pycache__

3
msgpack/__init__.py
View file

@ -22,8 +22,7 @@ if os.environ.get('MSGPACK_PUREPYTHON'):
from msgpack.fallback import Packer, unpackb, Unpacker from msgpack.fallback import Packer, unpackb, Unpacker
else: else:
try: try:
from msgpack._packer import Packer from msgpack._msgpack import Packer, unpackb, Unpacker
from msgpack._unpacker import unpackb, Unpacker
except ImportError: except ImportError:
from msgpack.fallback import Packer, unpackb, Unpacker from msgpack.fallback import Packer, unpackb, Unpacker

4
msgpack/_msgpack.pyx Normal file
View file

@ -0,0 +1,4 @@
# coding: utf-8
#cython: embedsignature=True, c_string_encoding=ascii
include "_packer.pyx"
include "_unpacker.pyx"

13
setup.py
View file

@ -68,8 +68,7 @@ if len(version) > 3 and version[3] != 'final':
if have_cython: if have_cython:
class Sdist(sdist): class Sdist(sdist):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
for src in glob('msgpack/*.pyx'): cythonize('msgpack/_msgpack.pyx')
cythonize(src)
sdist.__init__(self, *args, **kwargs) sdist.__init__(self, *args, **kwargs)
else: else:
Sdist = sdist Sdist = sdist
@ -85,14 +84,8 @@ else:
ext_modules = [] ext_modules = []
if not hasattr(sys, 'pypy_version_info'): if not hasattr(sys, 'pypy_version_info'):
ext_modules.append(Extension('msgpack._packer', ext_modules.append(Extension('msgpack._msgpack',
sources=['msgpack/_packer.cpp'], sources=['msgpack/_msgpack.cpp'],
libraries=libraries,
include_dirs=['.'],
define_macros=macros,
))
ext_modules.append(Extension('msgpack._unpacker',
sources=['msgpack/_unpacker.cpp'],
libraries=libraries, libraries=libraries,
include_dirs=['.'], include_dirs=['.'],
define_macros=macros, define_macros=macros,