Skip to content
This repository was archived by the owner on Jan 10, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Max Borghino <fmborghino@gmail.com>
Mohammad Abu-Garbeyyeh <github@mohammadag.com>
Josip Delic <delijati@gmail.com>
Greg E. <greateggsgreg@gmail.com>

Yongguang Lin <linsoft@yeah.net>
2 changes: 1 addition & 1 deletion adb/adb_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def ConnectDevice(self, port_path=None, serial=None, default_timeout_ms=None, **
# If there isnt a handle override (used by tests), build one here
if 'handle' in kwargs:
self._handle = kwargs.pop('handle')
elif serial and b':' in serial:
elif serial and ':' in serial:
self._handle = common.TcpHandle(serial, timeout_ms=default_timeout_ms)
else:
self._handle = common.UsbHandle.FindAndOpen(
Expand Down
4 changes: 2 additions & 2 deletions adb/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,8 @@ def __init__(self, serial, timeout_ms=None):

Host may be an IP address or a host name.
"""
if b':' in serial:
(host, port) = serial.split(b':')
if ':' in serial:
(host, port) = serial.split(':')
else:
host = serial
port = 5555
Expand Down
2 changes: 1 addition & 1 deletion adb/sign_pythonrsa.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# hashing algo for this.
class _Accum(object):
def __init__(self):
self._buf = ''
self._buf = b''

def update(self, msg):
self._buf += msg
Expand Down