djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/mpremote: Fix use of stdout_write_bytes function.

Browse Source 
Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-06-02 18:01:47 +10:00
parent ef497dc924
commit a61d40e5e8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/mpremote/mpremote/commands.py
View File

@ -5,7 +5,7 @@ import tempfile
import serial.tools.list_ports import serial.tools.list_ports
from .transport import TransportError from .transport import TransportError
from .transport_serial import SerialTransport from .transport_serial import SerialTransport, stdout_write_bytes
class CommandError(Exception): class CommandError(Exception):
@ -79,7 +79,7 @@ def do_disconnect(state, _args=None):
state.transport.exit_raw_repl() state.transport.exit_raw_repl()
except OSError: except OSError:
# Ignore any OSError exceptions when shutting down, eg: # Ignore any OSError exceptions when shutting down, eg:
# - pyboard.filesystem_command will close the connection if it had an error # - filesystem_command will close the connection if it had an error
# - umounting will fail if serial port disappeared # - umounting will fail if serial port disappeared
pass pass
state.transport.close() state.transport.close()
@ -190,11 +190,9 @@ def _do_execbuffer(state, buf, follow):
try: try:
state.transport.exec_raw_no_follow(buf) state.transport.exec_raw_no_follow(buf)
if follow: if follow:
ret, ret_err = state.transport.follow( ret, ret_err = state.transport.follow(timeout=None, data_consumer=stdout_write_bytes)
timeout=None, data_consumer=pyboard.stdout_write_bytes
)
if ret_err: if ret_err:
pyboard.stdout_write_bytes(ret_err) stdout_write_bytes(ret_err)
sys.exit(1) sys.exit(1)
except TransportError as er: except TransportError as er:
print(er) print(er)