Multiple improvements of cythonized code

* set cython language_level = 3
* Cythonize amqp.method_framing.Buffer
* Use directly chr() function
* Cythonize str_to_bytes() and bytes_to_str() in amqp/utils.py

7 files changed, 22 insertions, 5 deletions

diff --git a/amqp/abstract_channel.pxd b/amqp/abstract_channel.pxd
index d2e32b1..cfcaa62 100644
--- a/amqp/abstract_channel.pxd
+++ b/amqp/abstract_channel.pxd
@@ -1,3 +1,4 @@
+# cython: language_level=3
 import cython
 from .serialization cimport loads, dumps
 
diff --git a/amqp/basic_message.pxd b/amqp/basic_message.pxd
index 7ba043f..58bb4aa 100644
--- a/amqp/basic_message.pxd
+++ b/amqp/basic_message.pxd
@@ -1,4 +1,5 @@
-from serialization cimport GenericContent
+# cython: language_level=3
+from .serialization cimport GenericContent
 
 cdef class Message(GenericContent):
     cdef public object channel
diff --git a/amqp/method_framing.pxd b/amqp/method_framing.pxd
index 60ad8a1..4264471 100644
--- a/amqp/method_framing.pxd
+++ b/amqp/method_framing.pxd
@@ -1,4 +1,9 @@
-from basic_message cimport Message
+# cython: language_level=3
+from .basic_message cimport Message
 
 cdef object FRAME_OVERHEAD
 cdef object _CONTENT_METHODS
+
+cdef class Buffer:
+    cdef bytearray _buf
+    cdef object view
diff --git a/amqp/serialization.pxd b/amqp/serialization.pxd
index 0e86834..c7a06dd 100644
--- a/amqp/serialization.pxd
+++ b/amqp/serialization.pxd
@@ -1,5 +1,9 @@
+# cython: language_level=3
 import cython
 
+from amqp.utils cimport str_to_bytes
+from amqp.utils cimport bytes_to_str as pstr_t
+
 cdef int _flushbits(list bits, write)
 
 # Does not raise FrameSyntaxError due performance reasons
diff --git a/amqp/serialization.py b/amqp/serialization.py
index 1d1b377..75b082e 100644
--- a/amqp/serialization.py
+++ b/amqp/serialization.py
@@ -16,8 +16,6 @@ from .spec import Basic
 from .utils import bytes_to_str as pstr_t
 from .utils import str_to_bytes
 
-ftype_t = chr
-
 ILLEGAL_TABLE_TYPE = """\
     Table type {0!r} not handled by amqp.
 """
@@ -32,7 +30,7 @@ ILLEGAL_TABLE_TYPE_WITH_VALUE = """\
 
 
 def _read_item(buf, offset):
-    ftype = ftype_t(buf[offset])
+    ftype = chr(buf[offset])
     offset += 1
 
     # 'S': long string
diff --git a/amqp/utils.pxd b/amqp/utils.pxd
new file mode 100644
index 0000000..c56577d
--- /dev/null
+++ b/amqp/utils.pxd
@@ -0,0 +1,4 @@
+# cython: language_level=3
+
+cpdef str_to_bytes(s)
+cpdef bytes_to_str(s)
diff --git a/setup.py b/setup.py
index dae465e..5a520b4 100644
--- a/setup.py
+++ b/setup.py
@@ -124,6 +124,10 @@ if os.environ.get("CELERY_ENABLE_SPEEDUPS"):
             'amqp.abstract_channel',
             ["amqp/abstract_channel.py"],
         ),
+        setuptools.Extension(
+            'amqp.utils',
+            ["amqp/utils.py"],
+        ),
     ]
 else:
     setup_requires = []