IQ.Lvbs/pycapnp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for capnp 1.0 (#1)

Browse Source 
* add capnp_api.h to gitignore

* Change type of read_min_bytes from size to int

Not sure why this was not causing issues before or if that
is the right fix ... but it seems to be fine :)

* Adapt python_requires to >=3.8

This was overlooked when 3.7 was deprecated. The ci no longer
works with python 3.7 and cibuildwheel uses python_requires ...

* Replace deprecated find_module with find_spec (importlib)

find_module was deprecated with python 3.4 and python 3.12
removed it (https://docs.python.org/3.12/whatsnew/3.12.html#importlib).

The new command is find_spec and only required a few adaptions
This commit is contained in:
Tobias Ahrens
2023-10-11 20:28:24 +02:00
committed by GitHub
parent 313d0d4c6d
commit bb15822850
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
capnp/lib/capnp.pyx
View File

@@ -42,6 +42,7 @@ from types import ModuleType as _ModuleType
from operator import attrgetter as _attrgetter
from functools import partial as _partial
from contextlib import asynccontextmanager as _asynccontextmanager
from importlib.machinery import ModuleSpec
_CAPNP_VERSION_MAJOR = capnp.CAPNP_VERSION_MAJOR
_CAPNP_VERSION_MINOR = capnp.CAPNP_VERSION_MINOR
@@ -2423,7 +2424,7 @@ cdef class _PyAsyncIoStreamProtocol(DummyBaseClass, asyncio.BufferedProtocol):
# State for reading data from the transport
cdef char* read_buffer
cdef size_t read_min_bytes
cdef int32_t read_min_bytes
cdef size_t read_max_bytes
cdef size_t read_already_read
cdef PromiseFulfiller[size_t]* read_fulfiller
@@ -4322,7 +4323,7 @@ class _Importer:
self.extension = '.capnp'
self.additional_paths = additional_paths
def find_module(self, fullname, package_path=None):
def find_spec(self, fullname, package_path, target=None):
if fullname in _sys.modules: # Don't allow re-imports
return None
@@ -4363,12 +4364,12 @@ class _Importer:
path = abspath(path)
if is_file(path+sep+capnp_module_name):
return _Loader(fullname, join_path(path, capnp_module_name), self.additional_paths)
return ModuleSpec(fullname, _Loader(fullname, join_path(path, capnp_module_name), self.additional_paths))
if has_underscores:
if is_file(path+sep+capnp_module_name_dashes):
return _Loader(fullname, join_path(path, capnp_module_name_dashes), self.additional_paths)
return ModuleSpec(fullname, _Loader(fullname, join_path(path, capnp_module_name_dashes), self.additional_paths))
if is_file(path+sep+capnp_module_name_spaces):
return _Loader(fullname, join_path(path, capnp_module_name_spaces), self.additional_paths)
return ModuleSpec(fullname, _Loader(fullname, join_path(path, capnp_module_name_spaces), self.additional_paths))
_importer = None