summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--msgpack/__init__.py3
-rw-r--r--msgpack/_msgpack.pyx4
-rwxr-xr-xsetup.py13
4 files changed, 10 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 124f243..ff9a482 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ all: cython
.PHONY: cython
cython:
- cython --cplus msgpack/*.pyx
+ cython --cplus msgpack/_msgpack.pyx
.PHONY: test
test:
@@ -18,8 +18,7 @@ serve-doc: all
.PHONY: clean
clean:
rm -rf build
- rm -f msgpack/_packer.cpp
- rm -f msgpack/_unpacker.cpp
+ rm -f msgpack/_msgpack.cpp
rm -rf msgpack/__pycache__
rm -rf test/__pycache__
diff --git a/msgpack/__init__.py b/msgpack/__init__.py
index 3955a41..7c5d4c0 100644
--- a/msgpack/__init__.py
+++ b/msgpack/__init__.py
@@ -22,8 +22,7 @@ if os.environ.get('MSGPACK_PUREPYTHON'):
from msgpack.fallback import Packer, unpackb, Unpacker
else:
try:
- from msgpack._packer import Packer
- from msgpack._unpacker import unpackb, Unpacker
+ from msgpack._msgpack import Packer, unpackb, Unpacker
except ImportError:
from msgpack.fallback import Packer, unpackb, Unpacker
diff --git a/msgpack/_msgpack.pyx b/msgpack/_msgpack.pyx
new file mode 100644
index 0000000..4381394
--- /dev/null
+++ b/msgpack/_msgpack.pyx
@@ -0,0 +1,4 @@
+# coding: utf-8
+#cython: embedsignature=True, c_string_encoding=ascii
+include "_packer.pyx"
+include "_unpacker.pyx"
diff --git a/setup.py b/setup.py
index c252d81..8b8f7bd 100755
--- a/setup.py
+++ b/setup.py
@@ -68,8 +68,7 @@ if len(version) > 3 and version[3] != 'final':
if have_cython:
class Sdist(sdist):
def __init__(self, *args, **kwargs):
- for src in glob('msgpack/*.pyx'):
- cythonize(src)
+ cythonize('msgpack/_msgpack.pyx')
sdist.__init__(self, *args, **kwargs)
else:
Sdist = sdist
@@ -85,14 +84,8 @@ else:
ext_modules = []
if not hasattr(sys, 'pypy_version_info'):
- ext_modules.append(Extension('msgpack._packer',
- sources=['msgpack/_packer.cpp'],
- libraries=libraries,
- include_dirs=['.'],
- define_macros=macros,
- ))
- ext_modules.append(Extension('msgpack._unpacker',
- sources=['msgpack/_unpacker.cpp'],
+ ext_modules.append(Extension('msgpack._msgpack',
+ sources=['msgpack/_msgpack.cpp'],
libraries=libraries,
include_dirs=['.'],
define_macros=macros,