ezri/dbus-fast
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: small fixes for typing with older python versions (#167)

Browse Source
This commit is contained in:
J. Nick Koston
2022-11-17 14:19:05 -06:00
committed by GitHub
parent 650b8b6a0f
commit 1e32f284cd
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dbus_fast/_private/unmarshaller.pxd
View File

@@ -115,6 +115,7 @@ cdef class Unmarshaller:
cdef object _uint32_unpack cdef object _uint32_unpack
cdef object _int16_unpack cdef object _int16_unpack
cdef object _uint16_unpack cdef object _uint16_unpack
cdef object _stream_reader
cdef _reset(self) cdef _reset(self)

14
src/dbus_fast/_private/unmarshaller.py
View File

@@ -186,6 +186,7 @@ class Unmarshaller:
"_int16_unpack", "_int16_unpack",
"_uint16_unpack", "_uint16_unpack",
"_is_native", "_is_native",
"_stream_reader",
) )
def __init__(self, stream: io.BufferedRWPair, sock: Optional[socket.socket] = None): def __init__(self, stream: io.BufferedRWPair, sock: Optional[socket.socket] = None):
@@ -203,9 +204,14 @@ class Unmarshaller:
self._flag = 0 self._flag = 0
self._msg_len = 0 self._msg_len = 0
self._is_native = 0 self._is_native = 0
self._uint32_unpack: Callable | None = None self._uint32_unpack: Optional[Callable] = None
self._int16_unpack: Callable | None = None self._int16_unpack: Optional[Callable] = None
self._uint16_unpack: Callable | None = None self._uint16_unpack: Optional[Callable] = None
self._stream_reader: Optional[Callable] = None
if self._sock is None:
if isinstance(stream, io.BufferedRWPair) and hasattr(stream, "reader"):
self._stream_reader = stream.reader.read
self._stream_reader = stream.read
def reset(self) -> None: def reset(self) -> None:
"""Reset the unmarshaller to its initial state. """Reset the unmarshaller to its initial state.
@@ -269,7 +275,7 @@ class Unmarshaller:
start_len = len(self._buf) start_len = len(self._buf)
missing_bytes = pos - (start_len - self._pos) missing_bytes = pos - (start_len - self._pos)
if self._sock is None: if self._sock is None:
data = self._stream.read(missing_bytes) data = self._stream_reader(missing_bytes)
else: else:
data = self._read_sock(missing_bytes) data = self._read_sock(missing_bytes)
if data == b"": if data == b"":