commit acd3c7979740cf429f41e767e97789614cdd54e4
author Yilin Yang <kerker@google.com> Tue May 05 10:00:30 2020 +0800
committer Commit Bot <commit-bot@chromium.org> Wed May 06 12:31:04 2020 +0000
tree cb80826e4668539faae0b3f09daabc396df2ad4c
parent 7b76f54d7b0ff27e88ac02f737d2cb95f038a81c

factory: Remove python2 check

We have switched to python3, we need to remove these checks.

BUG=chromium:999876
TEST=make test

Change-Id: Ia1ef85b24f37d5e14bd61c6d2ee19184f25f1941
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/factory/+/2182090
Commit-Queue: Yilin Yang (kerker) <kerker@chromium.org>
Tested-by: Yilin Yang (kerker) <kerker@chromium.org>
Reviewed-by: Stimim Chen <stimim@chromium.org>

py/tools/ghost.py

diff --git a/py/tools/ghost.py b/py/tools/ghost.py
index fdd00f2..ffa3cc4 100755
--- a/py/tools/ghost.py
+++ b/py/tools/ghost.py
@@ -36,7 +36,6 @@
 
 import jsonrpclib
 from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer
-from six import PY2
 
 
 _GHOST_RPC_PORT = int(os.getenv('GHOST_RPC_PORT', 4499))
@@ -414,11 +413,7 @@
 
         try:
           h = codecs.decode(parts[2], 'hex')
-          # TODO(kerker) Remove when py3 upgrade complete
-          if PY2:
-            ips.append('%d.%d.%d.%d' % tuple(ord(x) for x in reversed(h)))
-          else:
-            ips.append('.'.join([str(x) for x in reversed(h)]))
+          ips.append('.'.join([str(x) for x in reversed(h)]))
         except (TypeError, binascii.Error):
           pass