From d782464c9150e448ab3a8d81197ff335e1ac2c2b Mon Sep 17 00:00:00 2001
From: INADA Naoki <methane@users.noreply.github.com>
Date: Wed, 14 Nov 2018 16:35:37 +0900
Subject: Refactor Cython code (#328)

_msgpack -> _cmsgpack
---
 msgpack/__init__.py   |  2 +-
 msgpack/_cmsgpack.pyx |  4 ++++
 msgpack/_msgpack.pyx  |  4 ----
 msgpack/_packer.pyx   | 10 +++-------
 msgpack/_unpacker.pyx | 22 +---------------------
 5 files changed, 9 insertions(+), 33 deletions(-)
 create mode 100644 msgpack/_cmsgpack.pyx
 delete mode 100644 msgpack/_msgpack.pyx

(limited to 'msgpack')

diff --git a/msgpack/__init__.py b/msgpack/__init__.py
index 7c5d4c0..7493c4c 100644
--- a/msgpack/__init__.py
+++ b/msgpack/__init__.py
@@ -22,7 +22,7 @@ if os.environ.get('MSGPACK_PUREPYTHON'):
     from msgpack.fallback import Packer, unpackb, Unpacker
 else:
     try:
-        from msgpack._msgpack import Packer, unpackb, Unpacker
+        from msgpack._cmsgpack import Packer, unpackb, Unpacker
     except ImportError:
         from msgpack.fallback import Packer, unpackb, Unpacker
 
diff --git a/msgpack/_cmsgpack.pyx b/msgpack/_cmsgpack.pyx
new file mode 100644
index 0000000..a48d5b5
--- /dev/null
+++ b/msgpack/_cmsgpack.pyx
@@ -0,0 +1,4 @@
+# coding: utf-8
+#cython: embedsignature=True, c_string_encoding=ascii, language_level=2
+include "_packer.pyx"
+include "_unpacker.pyx"
diff --git a/msgpack/_msgpack.pyx b/msgpack/_msgpack.pyx
deleted file mode 100644
index 4381394..0000000
--- a/msgpack/_msgpack.pyx
+++ /dev/null
@@ -1,4 +0,0 @@
-# coding: utf-8
-#cython: embedsignature=True, c_string_encoding=ascii
-include "_packer.pyx"
-include "_unpacker.pyx"
diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
index 2643f85..3be593f 100644
--- a/msgpack/_packer.pyx
+++ b/msgpack/_packer.pyx
@@ -1,9 +1,7 @@
 # coding: utf-8
-#cython: embedsignature=True, c_string_encoding=ascii
 
 from cpython cimport *
-from cpython.version cimport PY_MAJOR_VERSION
-from cpython.exc cimport PyErr_WarnEx
+from cpython.bytearray cimport PyByteArray_Check, PyByteArray_CheckExact
 
 from msgpack import ExtType
 
@@ -11,8 +9,6 @@ from msgpack import ExtType
 cdef extern from "Python.h":
 
     int PyMemoryView_Check(object obj)
-    int PyByteArray_Check(object obj)
-    int PyByteArray_CheckExact(object obj)
     char* PyUnicode_AsUTF8AndSize(object obj, Py_ssize_t *l) except NULL
 
 
@@ -204,7 +200,7 @@ cdef class Packer(object):
             elif PyBytesLike_CheckExact(o) if strict_types else PyBytesLike_Check(o):
                 L = len(o)
                 if L > ITEM_LIMIT:
-                    raise ValueError("%s is too large" % type(o).__name__)
+                    PyErr_Format(ValueError, b"%.200s object is too large", Py_TYPE(o).tp_name)
                 rawval = o
                 ret = msgpack_pack_bin(&self.pk, L)
                 if ret == 0:
@@ -280,7 +276,7 @@ cdef class Packer(object):
                 default_used = 1
                 continue
             else:
-                raise TypeError("can't serialize %r" % (o,))
+                PyErr_Format(TypeError, b"can not serialize '%.200s' object", Py_TYPE(o).tp_name)
             return ret
 
     cpdef pack(self, object obj):
diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
index e168587..aeebe2a 100644
--- a/msgpack/_unpacker.pyx
+++ b/msgpack/_unpacker.pyx
@@ -1,26 +1,6 @@
 # coding: utf-8
-#cython: embedsignature=True, c_string_encoding=ascii
 
-from cpython.version cimport PY_MAJOR_VERSION
-from cpython.bytes cimport (
-    PyBytes_AsString,
-    PyBytes_FromStringAndSize,
-    PyBytes_Size,
-)
-from cpython.buffer cimport (
-    Py_buffer,
-    PyObject_CheckBuffer,
-    PyObject_GetBuffer,
-    PyBuffer_Release,
-    PyBuffer_IsContiguous,
-    PyBUF_READ,
-    PyBUF_SIMPLE,
-    PyBUF_FULL_RO,
-)
-from cpython.mem cimport PyMem_Malloc, PyMem_Free
-from cpython.object cimport PyCallable_Check
-from cpython.ref cimport Py_DECREF
-from cpython.exc cimport PyErr_WarnEx
+from cpython cimport *
 
 cdef extern from "Python.h":
     ctypedef struct PyObject
-- 
cgit v1.2.1