commit bbe061d71f2a08c6e600fbaba673477ed444625f
author Joseph Hwang <josephsih@chromium.org> Thu Oct 22 08:46:25 2020
committer Commit Bot <commit-bot@chromium.org> Tue Oct 27 08:15:52 2020
tree 84ef17501847e8858d938df3283cb1bbbe48ec14
parent 74588e330c8a6ac81f4033d7c517e7a86a1e932b

Python3 Migration: utils

Make utils Python 2&3 compatible.

BUG=b:169724328
TEST=Conduct the following tests
python3 -m compileall -q .
python2 -m compileall -q .
python3 -m py_compile *.py
python2 -m py_compile *.py
Bluetooth AVL tests

Change-Id: I12adc14647e2f11b60dd4169f23ead3d501ebde1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/chameleon/+/2497728
Reviewed-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Tested-by: Shyh-In Hwang <josephsih@chromium.org>
Commit-Queue: Shyh-In Hwang <josephsih@chromium.org>

utils/screenshot

diff --git a/utils/screenshot b/utils/screenshot
index 792f3f8..5d7f480 100755
--- a/utils/screenshot
+++ b/utils/screenshot
@@ -4,17 +4,22 @@
 # found in the LICENSE file.
 """Connect to Chameleond and capture screenshot."""
 
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
 import argparse
+import codecs
 import errno
+from functools import reduce
 import operator
 import os
 import subprocess
 import sys
 import tempfile
 import time
-import xmlrpclib
+import six
+import six.moves.xmlrpc_client
 
 
 class Edid(object):
@@ -39,8 +44,7 @@
         if filename.upper().endswith('.TXT'):
             # Convert the EDID text format, returning from xrandr.
             data = reduce(operator.add,
-                          map(lambda s: s.strip().decode('hex'),
-                              open(filename).readlines()))
+                          [codecs.decode(s.strip(), 'hex') for s in open(filename).readlines()])
         else:
             data = open(filename).read()
         return cls(data)
@@ -77,7 +81,7 @@
       parser.print_help()
       sys.exit(errno.EINVAL)
 
-  chameleon = xmlrpclib.ServerProxy(
+  chameleon = six.moves.xmlrpc_client.ServerProxy(
       'http://%s:%d' % (options.host, options.port))
   inputs = chameleon.ProbeInputs()
   main_input = inputs[0]
@@ -93,7 +97,7 @@
     print('Reading EDID from %s...' % options.edid_file)
     edid = Edid.from_file(options.edid_file)
     print('Applying EDID...')
-    edid_id = chameleon.CreateEdid(xmlrpclib.Binary(edid.data))
+    edid_id = chameleon.CreateEdid(six.moves.xmlrpc_client.Binary(edid.data))
     chameleon.ApplyEdid(main_input, edid_id)
     chameleon.DestroyEdid(edid_id)
     time.sleep(1)