commit 153ed019d8c2c66f9b6116e5d909f215d5cae31c
author Gregory Nisbet <gregorynisbet@google.com> Wed Jul 15 17:11:21 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Oct 20 22:33:16 2020 +0000
tree 6a343b7024b4b30f178a92e97f4942054ab770f6
parent 2b7cd0fed989f4de4fbe090da2c09750c464cc12

[autotest] Make cros/faft/rpc_functions.py Python 3-compatible syntactically

BUG=chromium:990593
TEST=python3 -m py_compile .../rpc_functions.py

Change-Id: I41b7abe551454c57a1f9fd977980ea1c9a88ad9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2444889
Reviewed-by: Derek Beckett <dbeckett@chromium.org>
Commit-Queue: Gregory Nisbet <gregorynisbet@google.com>
Tested-by: Gregory Nisbet <gregorynisbet@google.com>

client/cros/faft/rpc_functions.py

diff --git a/client/cros/faft/rpc_functions.py b/client/cros/faft/rpc_functions.py
index 4957c0d..0515c14 100644
--- a/client/cros/faft/rpc_functions.py
+++ b/client/cros/faft/rpc_functions.py
@@ -7,11 +7,15 @@
 
 @note: When adding categories, please also update server/cros/faft/rpc_proxy.pyi
 """
+
+from __future__ import print_function
+
 import binascii
 import httplib
 import logging
 import os
 import signal
+import six
 import sys
 import tempfile
 import traceback
@@ -139,7 +143,7 @@
                             traceback.format_exception_only(exc_class, exc))
                     exc = xmlrpclib.Fault(
                             fault_code, '%s. %s' % (message, exc_str.rstrip()))
-                raise exc, None, tb
+                six.reraise(exc, None, tb)
             finally:
                 del exc_info
                 del tb