Replace Cython with pure C (#394)

Author: asvetlov

.azure-pipelines/deploy.yml

@@ -38,9 +38,6 @@ stages:
       - template: templates/step-build.yml@templates
         parameters:
           steps:
-            - script: |
-                make cythonize
-              displayName: 'Cythonize'
             - script: |
                 python setup.py sdist
               displayName: 'Make tarball'
@@ -80,7 +77,6 @@ stages:
 
       - script: |
           source .build-venv/bin/activate
-          make cythonize
           python setup.py bdist_wheel
         displayName: 'Make wheel'
 
@@ -152,7 +148,6 @@ stages:
           architecture: '$(python.architecture)'
           steps:
             - script: |
-                make cythonize
                 python setup.py bdist_wheel
               displayName: 'Make wheel'
 

.azure-pipelines/stage-test.yml

@@ -6,19 +6,19 @@ stages:
   - job:
     strategy:
       matrix:
-        Py35-Cython-Linux:
+        Py35-C-Linux:
           python.version: '3.5'
           no_extensions: ''
           image: 'ubuntu-latest'
-        Py36-Cython-Linux:
+        Py36-C-Linux:
           python.version: '3.6'
           no_extensions: ''
           image: 'ubuntu-latest'
-        Py37-Cython-Linux:
+        Py37-C-Linux:
           python.version: '3.7'
           no_extensions: ''
           image: 'ubuntu-latest'
-        Py38-Cython-Linux:
+        Py38-C-Linux:
           python.version: '3.8'
           no_extensions: ''
           image: 'ubuntu-latest'
@@ -42,35 +42,35 @@ stages:
 #          python.version: 'pypy3'
 #          no_extensions: 'Y'
 #          image: 'ubuntu-latest'
-        Py35-Cython-Win:
+        Py35-C-Win:
           python.version: '3.5'
           no_extensions: ''
           image: 'vs2017-win2016'
-        Py36-Cython-Win:
+        Py36-C-Win:
           python.version: '3.6'
           no_extensions: ''
           image: 'windows-latest'
-        Py37-Cython-Win:
+        Py37-C-Win:
           python.version: '3.7'
           no_extensions: ''
           image: 'windows-latest'
-        Py38-Cython-Win:
+        Py38-C-Win:
           python.version: '3.8'
           no_extensions: ''
           image: 'windows-latest'
-        Py35-Cython-Mac:
+        Py35-C-Mac:
           python.version: '3.5'
           no_extensions: ''
           image: 'macos-latest'
-        Py36-Cython-Mac:
+        Py36-C-Mac:
           python.version: '3.6'
           no_extensions: ''
           image: 'macos-latest'
-        Py37-Cython-Mac:
+        Py37-C-Mac:
           python.version: '3.7'
           no_extensions: ''
           image: 'macos-latest'
-        Py38-Cython-Mac:
+        Py38-C-Mac:
           python.version: '3.8'
           no_extensions: ''
           image: 'macos-latest'
@@ -93,11 +93,6 @@ stages:
         python -m pip install --upgrade pip setuptools wheel
       displayName: 'Update pip'
 
-    - script: |
-        make cythonize
-      condition: eq(variables['no_extensions'], '')
-      displayName: 'Cythonize'
-
     - script: |
         python setup.py install
       displayName: 'Install itself'

CHANGES/249.feature

@@ -0,0 +1 @@
+Replace Cython optimization with pure C

Makefile

@@ -7,16 +7,7 @@ SRC = multidict tests setup.py
 
 all: test
 
-.install-cython:
-	pip install -r requirements/cython.txt
-	touch .install-cython
-
-multidict/%.c: multidict/%.pyx
-	cython -3 -o $@ $< -I multidict
-
-cythonize: .install-cython $(PYXS:.pyx=.c)
-
-.install-deps: cythonize $(shell find requirements -type f)
+.install-deps: $(shell find requirements -type f)
 	pip install -r requirements/dev.txt
 	@touch .install-deps
 
@@ -116,10 +107,8 @@ clean:
 	rm -f multidict/_multidict.c
 	rm -f multidict/_multidict.*.so
 	rm -f multidict/_multidict.*.pyd
+	rm -f multidict/_multidict_c.*.so
+	rm -f multidict/_multidict_c.*.pyd
 	rm -f multidict/_istr.*.so
 	rm -f multidict/_istr.*.pyd
-	rm -f multidict/_pair_list.*.so
-	rm -f multidict/_pair_list.*.pyd
-	rm -f multidict/_multidict_iter.*.so
-	rm -f multidict/_multidict_iter.*.pyd
 	rm -rf .tox

README.rst

@@ -64,7 +64,7 @@ insensitive, e.g.::
 
 *Keys* should be ``str`` or ``istr`` instances.
 
-The library has optional Cython_ optimization for sake of speed.
+The library has optional C Extensions for sake of speed.
 
 
 License
@@ -73,10 +73,6 @@ License
 Apache 2
 
 
-.. _aiohttp: https://github.com/KeepSafe/aiohttp
-.. _Cython: http://cython.org/
-
-
 Changelog
 ---------
 See `RTD page <http://multidict.readthedocs.org/en/latest/changes.html>`_.

docs/index.rst

@@ -47,7 +47,7 @@ insensitive, e.g.::
 
 *Keys* should be either :class:`str` or :class:`istr` instance.
 
-The library has optional Cython_ optimization for sake of speed.
+The library has optional C Extensions for sake of speed.
 
 Library Installation
 --------------------
@@ -104,4 +104,3 @@ Indices and tables
 * :ref:`search`
 
 .. _GitHub: https://github.com/aio-libs/multidict
-.. _Cython: http://cython.org/

multidict/_istr.c

@@ -84,7 +84,7 @@ static PyTypeObject istr_type = {
     sizeof(istrobject),
     0,
     (destructor)istr_dealloc,                   /* tp_dealloc */
-    0,                                          /* tp_print */
+    0,                                          /* tp_vectorcall_offset */
     0,                                          /* tp_getattr */
     0,                                          /* tp_setattr */
     0,                                          /* tp_reserved */