summaryrefslogtreecommitdiff
path: root/msgpack
diff options
context:
space:
mode:
authorINADA Naoki <songofacandy@gmail.com>2018-10-03 20:55:51 +0900
committerInada Naoki <songofacandy@gmail.com>2018-11-08 20:27:35 +0900
commitf6f95972492bcb83d8fe4c63be3b96d46e47bab7 (patch)
treee0003078b772d6c0e3a22862f8494bb723388a97 /msgpack
parent91ec9e1daf5cc915a47e2b356a7b1dd9662573a3 (diff)
downloadmsgpack-python-f6f95972492bcb83d8fe4c63be3b96d46e47bab7.tar.gz
Merge extension module
There were `_packer.so` and `_unpacker.so`. But single module is simpler than double module. Merge extension module into single `_msgpack.so`.
Diffstat (limited to 'msgpack')
-rw-r--r--msgpack/__init__.py3
-rw-r--r--msgpack/_msgpack.pyx4
2 files changed, 5 insertions, 2 deletions
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"