[autotest] Make cli/*.py Python3-compatible syntax-wise.
Note: This change intentionally making substantial changes
such as changing all string literals to byte literals.
BUG=chromium:990593
TEST=python3 -m python_compile cli/*.py
Change-Id: I27c6428e2271e8b24ac38dc17f3e76b06b435cba
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2298217
Tested-by: Gregory Nisbet <[email protected]>
Reviewed-by: Mike Frysinger <[email protected]>
Commit-Queue: Gregory Nisbet <[email protected]>
diff --git a/cli/action_common.py b/cli/action_common.py
index ce02007..6cb7599 100644
--- a/cli/action_common.py
+++ b/cli/action_common.py
@@ -41,6 +41,8 @@
"""
+from __future__ import print_function
+
import types
from autotest_lib.cli import topic_common
@@ -212,7 +214,7 @@
self.execute_rpc(op=op, # The opcode
**{'id': item, what: uhs}) # The data
setattr(self, 'good_%s' % what, uhs)
- except topic_common.CliError, full_error:
+ except topic_common.CliError as full_error:
bad_uhs = self.parse_json_exception(full_error)
good_uhs = list(set(uhs) - set(bad_uhs))
if bad_uhs and good_uhs:
@@ -250,7 +252,7 @@
self._add_remove_uh_to_topic(item, what)
except AttributeError:
pass
- except topic_common.CliError, err:
+ except topic_common.CliError as err:
# The error was already logged by
# self.failure()
pass
