Fix string handling for TCP Handler (#54)

google · Aug 11, 2017 · cb4ae46 · cb4ae46
1 parent bed1a53
commit cb4ae46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/adb/adb_commands.py b/adb/adb_commands.py
@@ -95,7 +95,7 @@ def Connect(cls, usb, banner=None, **kwargs):
       An instance of this class if the device connected successfully.
     """
     if not banner:
-      banner = socket.gethostname()
+      banner = socket.gethostname().encode()
     device_state = cls.protocol_handler.Connect(usb, banner=banner, **kwargs)
     # Remove banner and colons after device state (state::banner)
     device_state = device_state.split(b':')[0]

diff --git a/adb/common.py b/adb/common.py
@@ -287,8 +287,8 @@ def __init__(self, serial):
 
     Host may be an IP address or a host name.
     """
-    if ':' in serial:
-      (host, port) = serial.split(':')
+    if b':' in serial:
+      (host, port) = serial.split(b':')
     else:
       host = serial
       port = 5555