From c74a7ee5cf74e8a081aafa81c4f577e00edd7a36 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Wed, 31 May 2017 11:00:44 +0200 Subject: [PATCH 1/2] Set SYSFS_PORT_SPLIT_RE Test: Use path returned by adb devices -l (namely 1-13.3.3), and ensure it has been parsed properly --- adb/common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adb/common.py b/adb/common.py index 885392e..1d39055 100644 --- a/adb/common.py +++ b/adb/common.py @@ -22,10 +22,12 @@ import libusb1 import usb1 +import re from adb import usb_exceptions DEFAULT_TIMEOUT_MS = 1000 +SYSFS_PORT_SPLIT_RE = re.compile("[,/:.-]") _LOG = logging.getLogger('android_usb') From fbeb7dfd99b69ac86b9a43d21b233024d6e9f2f1 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Wed, 31 May 2017 11:42:29 +0200 Subject: [PATCH 2/2] Don't duplicate port path parsing --- adb/common_cli.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/adb/common_cli.py b/adb/common_cli.py index 270c44f..98d1716 100644 --- a/adb/common_cli.py +++ b/adb/common_cli.py @@ -30,14 +30,6 @@ from adb import usb_exceptions - -class _PortPathAction(argparse.Action): - def __call__(self, parser, namespace, values, option_string=None): - setattr( - namespace, self.dest, - [int(i) for i in values.replace('/', ',').split(',')]) - - class PositionalArg(argparse.Action): def __call__(self, parser, namespace, values, option_string=None): namespace.positional.append(values) @@ -49,7 +41,7 @@ def GetDeviceArguments(): '--timeout_ms', default=10000, type=int, metavar='10000', help='Timeout in milliseconds.') group.add_argument( - '--port_path', action=_PortPathAction, + '--port_path', help='USB port path integers (eg 1,2 or 2,1,1)') group.add_argument( '-s', '--serial',