Reland "[Autotest] Python3 files/server/* migration"
Fixed the division errors
This is a reland of b05fb5a3dd205d085395c3e2f7d05127cabd07ec
TEST=network_WiFi_ChannelHop && network_WiFi_SimpleConnect.wifi_check24HT20
Original change's description:
> [Autotest] Python3 files/server/* migration
>
> Does not include subdirs
> TEST=applicable unittests, compiling in py2 and py3
> BUG=chromium:990593
>
> Change-Id: I668c7531e7fc926f9a20c3bf2bab0d62eb3e3926
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2318565
> Commit-Queue: Derek Beckett <dbeckett@chromium.org>
> Tested-by: Derek Beckett <dbeckett@chromium.org>
> Reviewed-by: Greg Edelston <gredelston@google.com>
Bug: chromium:990593
Change-Id: I912aa024130987af313dc472a273267669e6b69c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2373204
Commit-Queue: Derek Beckett <dbeckett@chromium.org>
Tested-by: Derek Beckett <dbeckett@chromium.org>
Reviewed-by: Greg Edelston <gredelston@google.com>
Reviewed-by: Gregory Nisbet <gregorynisbet@google.com>
Auto-Submit: Derek Beckett <dbeckett@chromium.org>
diff --git a/server/frontend.py b/server/frontend.py
index fe942e0..b0d8f97 100644
--- a/server/frontend.py
+++ b/server/frontend.py
@@ -1,3 +1,4 @@
+# Lint as: python2, python3
# Copyright Martin J. Bligh, Google Inc 2008
# Released under the GPL v2
@@ -15,6 +16,10 @@
#pylint: disable=missing-docstring
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
import getpass
import os
import re
@@ -28,6 +33,7 @@
from autotest_lib.client.common_lib import priorities
from autotest_lib.client.common_lib import utils
from autotest_lib.tko import db
+from six.moves import zip
try:
from chromite.lib import metrics
@@ -92,8 +98,8 @@
headers = {'AUTHORIZATION': self.user}
rpc_server = rpc_client_lib.add_protocol(server) + path
if debug:
- print 'SERVER: %s' % rpc_server
- print 'HEADERS: %s' % headers
+ print('SERVER: %s' % rpc_server)
+ print('HEADERS: %s' % headers)
self.proxy = rpc_client_lib.get_proxy(rpc_server, headers=headers)
@@ -103,11 +109,11 @@
"""
rpc_call = getattr(self.proxy, call)
if self.debug:
- print 'DEBUG: %s %s' % (call, dargs)
+ print('DEBUG: %s %s' % (call, dargs))
try:
result = utils.strip_unicode(rpc_call(**dargs))
if self.reply_debug:
- print result
+ print(result)
return result
except Exception:
raise
@@ -115,7 +121,7 @@
def log(self, message):
if self.print_log:
- print message
+ print(message)
class TKO(RpcClient):
@@ -867,9 +873,9 @@
def show(self):
labels = list(set(self.labels) - set([self.platform]))
- print '%-6s %-7s %-7s %-16s %s' % (self.hostname, self.status,
+ print('%-6s %-7s %-7s %-16s %s' % (self.hostname, self.status,
self.locked, self.platform,
- ', '.join(labels))
+ ', '.join(labels)))
def delete(self):