Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.

Set SYSFS_PORT_SPLIT_RE #45

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set SYSFS_PORT_SPLIT_RE #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c74a7ee
Set SYSFS_PORT_SPLIT_RE
phhusson May 31, 2017
fbeb7df
Don't duplicate port path parsing
phhusson May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions adb/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
10 changes: 1 addition & 9 deletions adb/common_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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',
Expand Down