Re: [PATCH 2/4] bbremote: Convert to python3
On Tue, 2022-09-06 at 12:20 +0200, Sascha Hauer wrote:
> This is the long overdue conversion from python2 to python3.
>
> Signed-off-by: Sascha Hauer
> ---
> scripts/bbremote | 2 +-
> scripts/remote/controller.py | 21 +++--
> scripts/remote/main.py | 8
> scripts/remote/messages.py | 15 +--
> scripts/remote/ratp.py | 4 ++--
> scripts/remote/ratpfs.py | 4 ++--
> scripts/remote/threadstdio.py | 4 ++--
> 7 files changed, 35 insertions(+), 23 deletions(-)
>
> diff --git a/scripts/bbremote b/scripts/bbremote
> index bc5351dbae..1eeabd08d1 100755
> --- a/scripts/bbremote
> +++ b/scripts/bbremote
> @@ -1,3 +1,3 @@
> -#!/usr/bin/env python2
> +#!/usr/bin/env python3
>
> import remote.main
> diff --git a/scripts/remote/controller.py b/scripts/remote/controller.py
> index b4493591dd..a3ae260558 100644
> --- a/scripts/remote/controller.py
> +++ b/scripts/remote/controller.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python2
> +#!/usr/bin/env python3
> # -*- coding: utf-8 -*-
>
> from __future__ import absolute_import, division, print_function
> @@ -8,7 +8,7 @@ import logging
> import sys
> import os
> from threading import Thread
> -from Queue import Queue, Empty
> +from queue import Queue, Empty
> from .ratpfs import RatpFSServer
> from .messages import *
> from .ratp import RatpError
> @@ -105,7 +105,7 @@ class Controller(Thread):
> self.rxq = None
> self.conn.connect(timeout=5.0)
> self._txq = Queue()
> - self._stop = False
> + self._stopit = False
Is this rename needed?
> self.fsserver = RatpFSServer()
>
> def _send(self, bbpkt):
> @@ -147,24 +147,24 @@ class Controller(Thread):
> return 0
>
> def command(self, cmd):
> - self._send(BBPacketCommand(cmd=cmd))
> + self._send(BBPacketCommand(cmd=cmd.encode()))
> r = self._expect(BBPacketCommandReturn, timeout=None)
> logging.info("Command: %r", r)
> return r.exit_code
>
> def getenv(self, varname):
> - self._send(BBPacketGetenv(varname=varname))
> + self._send(BBPacketGetenv(varname=varname.encode()))
> r = self._expect(BBPacketGetenvReturn)
> return r.text
>
> def md(self, path, addr, size):
> - self._send(BBPacketMd(path=path, addr=addr, size=size))
> + self._send(BBPacketMd(path=path.encode(), addr=addr, size=size))
> r = self._expect(BBPacketMdReturn)
> logging.info("Md return: %r", r)
> return (r.exit_code,r.data)
>
> def mw(self, path, addr, data):
> - self._send(BBPacketMw(path=path, addr=addr, data=data))
> + self._send(BBPacketMw(path=path.encode(), addr=addr, data=data))
> r = self._expect(BBPacketMwReturn)
> logging.info("Mw return: %r", r)
> return (r.exit_code,r.written)
> @@ -208,7 +208,7 @@ class Controller(Thread):
> def run(self):
> assert self.rxq is not None
> try:
> - while not self._stop:
> + while not self._stopit:
> # receive
> pkt = self.conn.recv()
> if pkt:
> @@ -235,15 +235,16 @@ class Controller(Thread):
> Thread.start(self)
>
> def stop(self):
> - self._stop = True
> + self._stopit = True
> self.join()
> - self._stop = False
> + self._stopit = False
> self.rxq = None
>
> def send_async(self, pkt):
> self._txq.put(pkt)
>
> def send_async_console(self, text):
> + assert isinstance(text, bytes)
> self._txq.put(BBPacketConsoleMsg(text=text))
>
> def send_async_ping(self):
> diff --git a/scripts/remote/main.py b/scripts/remote/main.py
> index cef5d92ee2..b99dba180a 100644
> --- a/scripts/remote/main.py
> +++ b/scripts/remote/main.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python2
> +#!/usr/bin/env python3
>
> from __future__ import absolute_import, division, print_function
>
> @@ -7,7 +7,7 @@ import os
> import argparse
> import binascii
> import logging
> -from Queue import Queue
> +from queue import Queue
> from .ratp import RatpError
>
> try:
> @@ -162,8 +162,8 @@ def handle_console(args):
> ctrl = get_controller(args)
> ctrl.export(args.export)
> ctrl.start(queue)
> - ctrl.send_async_console('\r')
> - cons = ConsoleInput(queue, exit='\x14') # CTRL-T
> + ctrl.send_async_console(b'\r')
> + cons = ConsoleInput(queue, exit=b'\x14') # CTRL-T
> cons.start()
> try:
> while True:
> diff --git a/scripts/remote/messages.py b/scripts/remote/messages.py
> index abd331c8b6..ae36189d4c 100644
> --- a/scripts/remote/messages.py
> +++ b/scripts/remote/messages.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python2
> +#!/usr/bin/env python3
> # -*- coding: utf-8 -*-
>
> from __future__ import absolute_import, division, print_function
> @@ -41,12 +41,13 @@ class
[PATCH 0/4] RATP updates
This series has some updates for the barebox RATP support, most importantly the python3 conversion of the host side python scripts. Sascha Hauer (4): remove local pyserial bbremote: Convert to python3 ratp: getenv: Do not crash on non-existing variables ratp: i2c: Do not return error common/ratp/getenv.c |3 + common/ratp/i2c.c |4 +- scripts/bbremote |2 +- scripts/remote/controller.py | 21 +- scripts/remote/main.py|8 +- scripts/remote/messages.py| 15 +- scripts/remote/ratp.py|4 +- scripts/remote/ratpfs.py |4 +- scripts/remote/threadstdio.py |4 +- scripts/serial/__init__.py| 79 - scripts/serial/rfc2217.py | 1327 - scripts/serial/serialcli.py | 284 scripts/serial/serialposix.py | 730 - scripts/serial/serialutil.py | 572 --- scripts/serial/tools/__init__.py |1 - scripts/serial/tools/list_ports.py| 103 -- scripts/serial/tools/list_ports_linux.py | 152 -- scripts/serial/urlhandler/__init__.py |1 - scripts/serial/urlhandler/protocol_hwgrep.py | 45 - scripts/serial/urlhandler/protocol_loop.py| 279 scripts/serial/urlhandler/protocol_rfc2217.py | 11 - scripts/serial/urlhandler/protocol_socket.py | 291 22 files changed, 40 insertions(+), 3900 deletions(-) delete mode 100644 scripts/serial/__init__.py delete mode 100644 scripts/serial/rfc2217.py delete mode 100644 scripts/serial/serialcli.py delete mode 100644 scripts/serial/serialposix.py delete mode 100644 scripts/serial/serialutil.py delete mode 100644 scripts/serial/tools/__init__.py delete mode 100644 scripts/serial/tools/list_ports.py delete mode 100644 scripts/serial/tools/list_ports_linux.py delete mode 100644 scripts/serial/urlhandler/__init__.py delete mode 100644 scripts/serial/urlhandler/protocol_hwgrep.py delete mode 100644 scripts/serial/urlhandler/protocol_loop.py delete mode 100644 scripts/serial/urlhandler/protocol_rfc2217.py delete mode 100644 scripts/serial/urlhandler/protocol_socket.py -- 2.30.2
[PATCH 3/4] ratp: getenv: Do not crash on non-existing variables
getenv() returns NULL on non-existing variables. Replace result with empty string to avoid doing strlen() on a NULL pointer. Signed-off-by: Sascha Hauer --- common/ratp/getenv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/ratp/getenv.c b/common/ratp/getenv.c index 7b38d2e363..9617ab1b43 100644 --- a/common/ratp/getenv.c +++ b/common/ratp/getenv.c @@ -32,6 +32,9 @@ static int ratp_cmd_getenv(const struct ratp_bb *req, int req_len, value = getenv(varname); free(varname); + if (!value) + value = ""; + dlen = strlen(value); *rsp_len = sizeof(struct ratp_bb) + dlen; -- 2.30.2
[PATCH 4/4] ratp: i2c: Do not return error
The RATP command implementations should only return an error on internal failures. When an i2c command failed we should return 0 though to actually send the error message. Without it the remote would just wait for a response until it times out. Signed-off-by: Sascha Hauer --- common/ratp/i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/ratp/i2c.c b/common/ratp/i2c.c index c14bbbf9b9..404ddd2ece 100644 --- a/common/ratp/i2c.c +++ b/common/ratp/i2c.c @@ -162,7 +162,7 @@ out: *rsp = (struct ratp_bb *)i2c_read_rsp; *rsp_len = i2c_read_rsp_len; - return ret; + return 0; } BAREBOX_RATP_CMD_START(I2C_READ) @@ -271,7 +271,7 @@ out: *rsp = (struct ratp_bb *)i2c_write_rsp; *rsp_len = sizeof(*i2c_write_rsp); - return ret; + return 0; } BAREBOX_RATP_CMD_START(I2C_WRITE) -- 2.30.2
[PATCH 2/4] bbremote: Convert to python3
This is the long overdue conversion from python2 to python3.
Signed-off-by: Sascha Hauer
---
scripts/bbremote | 2 +-
scripts/remote/controller.py | 21 +++--
scripts/remote/main.py| 8
scripts/remote/messages.py| 15 +--
scripts/remote/ratp.py| 4 ++--
scripts/remote/ratpfs.py | 4 ++--
scripts/remote/threadstdio.py | 4 ++--
7 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/scripts/bbremote b/scripts/bbremote
index bc5351dbae..1eeabd08d1 100755
--- a/scripts/bbremote
+++ b/scripts/bbremote
@@ -1,3 +1,3 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
import remote.main
diff --git a/scripts/remote/controller.py b/scripts/remote/controller.py
index b4493591dd..a3ae260558 100644
--- a/scripts/remote/controller.py
+++ b/scripts/remote/controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
from __future__ import absolute_import, division, print_function
@@ -8,7 +8,7 @@ import logging
import sys
import os
from threading import Thread
-from Queue import Queue, Empty
+from queue import Queue, Empty
from .ratpfs import RatpFSServer
from .messages import *
from .ratp import RatpError
@@ -105,7 +105,7 @@ class Controller(Thread):
self.rxq = None
self.conn.connect(timeout=5.0)
self._txq = Queue()
-self._stop = False
+self._stopit = False
self.fsserver = RatpFSServer()
def _send(self, bbpkt):
@@ -147,24 +147,24 @@ class Controller(Thread):
return 0
def command(self, cmd):
-self._send(BBPacketCommand(cmd=cmd))
+self._send(BBPacketCommand(cmd=cmd.encode()))
r = self._expect(BBPacketCommandReturn, timeout=None)
logging.info("Command: %r", r)
return r.exit_code
def getenv(self, varname):
-self._send(BBPacketGetenv(varname=varname))
+self._send(BBPacketGetenv(varname=varname.encode()))
r = self._expect(BBPacketGetenvReturn)
return r.text
def md(self, path, addr, size):
-self._send(BBPacketMd(path=path, addr=addr, size=size))
+self._send(BBPacketMd(path=path.encode(), addr=addr, size=size))
r = self._expect(BBPacketMdReturn)
logging.info("Md return: %r", r)
return (r.exit_code,r.data)
def mw(self, path, addr, data):
-self._send(BBPacketMw(path=path, addr=addr, data=data))
+self._send(BBPacketMw(path=path.encode(), addr=addr, data=data))
r = self._expect(BBPacketMwReturn)
logging.info("Mw return: %r", r)
return (r.exit_code,r.written)
@@ -208,7 +208,7 @@ class Controller(Thread):
def run(self):
assert self.rxq is not None
try:
-while not self._stop:
+while not self._stopit:
# receive
pkt = self.conn.recv()
if pkt:
@@ -235,15 +235,16 @@ class Controller(Thread):
Thread.start(self)
def stop(self):
-self._stop = True
+self._stopit = True
self.join()
-self._stop = False
+self._stopit = False
self.rxq = None
def send_async(self, pkt):
self._txq.put(pkt)
def send_async_console(self, text):
+assert isinstance(text, bytes)
self._txq.put(BBPacketConsoleMsg(text=text))
def send_async_ping(self):
diff --git a/scripts/remote/main.py b/scripts/remote/main.py
index cef5d92ee2..b99dba180a 100644
--- a/scripts/remote/main.py
+++ b/scripts/remote/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
from __future__ import absolute_import, division, print_function
@@ -7,7 +7,7 @@ import os
import argparse
import binascii
import logging
-from Queue import Queue
+from queue import Queue
from .ratp import RatpError
try:
@@ -162,8 +162,8 @@ def handle_console(args):
ctrl = get_controller(args)
ctrl.export(args.export)
ctrl.start(queue)
-ctrl.send_async_console('\r')
-cons = ConsoleInput(queue, exit='\x14') # CTRL-T
+ctrl.send_async_console(b'\r')
+cons = ConsoleInput(queue, exit=b'\x14') # CTRL-T
cons.start()
try:
while True:
diff --git a/scripts/remote/messages.py b/scripts/remote/messages.py
index abd331c8b6..ae36189d4c 100644
--- a/scripts/remote/messages.py
+++ b/scripts/remote/messages.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
from __future__ import absolute_import, division, print_function
@@ -41,12 +41,13 @@ class BBPacket(object):
if raw is not None:
self.unpack(raw)
else:
-self.payload = payload
+self.payload = payload.encode()
def __repr__(self):
return "BBPacket(%i, %i)" % (self.p_type, self.p_flags)
def _unpack_payload(self, data):
+assert isinstance(data, bytes)
self.payload = data
