jonathan/scopething
1
0
Fork 0
mirror of https://github.com/jonathanhogg/scopething synced 2025-07-14 03:02:09 +01:00
Code Issues Releases Wiki Activity

Move pushback buffer into vm so that it will work with other kinds of stream; move stream closing into same for neatness; support cancelling capturing through asyncio.Task cancellation

Browse Source
This commit is contained in:
Jonathan Hogg
2017-07-26 13:45:23 +01:00
parent b09acd6905
commit fc961fb2a0
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
streams.py
View File

@ -56,7 +56,6 @@ class SerialStream:
self._loop = loop if loop is not None else asyncio.get_event_loop()
self._output_buffer = bytes()
self._output_buffer_empty = None
self._pushback_buffer = bytes()
def __repr__(self):
return f'<{self.__class__.__name__}:{self._device}>'
@ -105,14 +104,7 @@ class SerialStream:
self._output_buffer_empty.set_result(None)
self._output_buffer_empty = None
def pushback(self, data):
self._pushback_buffer += data
async def read(self, n=None):
if self._pushback_buffer:
data = self._pushback_buffer if n is None else self._pushback_buffer[:n]
self._pushback_buffer = self._pushback_buffer[len(data):]
return data
while True:
w = self._connection.in_waiting
if w: