varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2026-02-10 15:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change default value of read()

Browse Source 
From `n = -1` to `n = None`, to comply with trio API
This commit is contained in:
mhchia
2020-01-26 23:03:38 +08:00
parent 6e01a7da31
commit 5b4b65faa8
9 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libp2p/io/abc.py
View File

@ -8,7 +8,7 @@ class Closer(ABC):
class Reader(ABC):
@abstractmethod
async def read(self, n: int = -1) -> bytes:
async def read(self, n: int = None) -> bytes:
...

2
libp2p/io/msgio.py
View File

@ -54,7 +54,7 @@ class MsgIOReader(ReadCloser):
self.read_closer = read_closer
self.next_length = None
async def read(self, n: int = -1) -> bytes:
async def read(self, n: int = None) -> bytes:
return await self.read_msg()
async def read_msg(self) -> bytes:

15
libp2p/io/trio.py
View File

@ -26,22 +26,13 @@ class TrioTCPStream(ReadWriteCloser):
await self.stream.send_all(data)
except (trio.ClosedResourceError, trio.BrokenResourceError) as error:
raise IOException from error
except trio.BusyResourceError as error:
# This should never happen, since we already access streams with read/write locks.
raise Exception(
"this should never happen "
"since we already access streams with read/write locks."
) from error
async def read(self, n: int = -1) -> bytes:
async def read(self, n: int = None) -> bytes:
async with self.read_lock:
if n == 0:
# Checkpoint
await trio.hazmat.checkpoint()
if n is not None and n == 0:
return b""
max_bytes = n if n != -1 else None
try:
return await self.stream.receive_some(max_bytes)
return await self.stream.receive_some(n)
except (trio.ClosedResourceError, trio.BrokenResourceError) as error:
raise IOException from error
except trio.BusyResourceError as error: