Make run_tests.py python-version agnostic

5 files changed, 25 insertions, 23 deletions

diff --git a/tools/run_tests/python_utils/jobset.py b/tools/run_tests/python_utils/jobset.py
index b732e1e03e..578712c393 100755
--- a/tools/run_tests/python_utils/jobset.py
+++ b/tools/run_tests/python_utils/jobset.py
@@ -13,8 +13,6 @@
 # limitations under the License.
 """Run a group of subprocesses and then finish."""
 
-from __future__ import print_function
-
 import logging
 import multiprocessing
 import os
@@ -118,7 +116,7 @@ def eintr_be_gone(fn):
     while True:
         try:
             return fn()
-        except IOError, e:
+        except IOError as e:
             if e.errno != errno.EINTR:
                 raise
 
@@ -144,7 +142,7 @@ def message(tag, msg, explanatory_text=None, do_newline=False):
                      if do_newline or explanatory_text is not None else ''))
             sys.stdout.flush()
             return
-        except IOError, e:
+        except IOError as e:
             if e.errno != errno.EINTR:
                 raise
 
diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py
index 83e09c09d0..243eef6827 100755
--- a/tools/run_tests/python_utils/port_server.py
+++ b/tools/run_tests/python_utils/port_server.py
@@ -14,15 +14,17 @@
 # limitations under the License.
 """Manage TCP ports for unit tests; started by run_tests.py"""
 
+from __future__ import print_function
+
 import argparse
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+from six.moves.BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+from six.moves.socketserver import ThreadingMixIn
 import hashlib
 import os
 import socket
 import sys
 import time
 import random
-from SocketServer import ThreadingMixIn
 import threading
 import platform
 
@@ -32,7 +34,7 @@ import platform
 _MY_VERSION = 20
 
 if len(sys.argv) == 2 and sys.argv[1] == 'dump_version':
-    print _MY_VERSION
+    print(_MY_VERSION)
     sys.exit(0)
 
 argp = argparse.ArgumentParser(description='Server for httpcli_test')
@@ -47,7 +49,7 @@ if args.logfile is not None:
     sys.stderr = open(args.logfile, 'w')
     sys.stdout = sys.stderr
 
-print 'port server running on port %d' % args.port
+print('port server running on port %d' % args.port)
 
 pool = []
 in_use = {}
@@ -74,7 +76,7 @@ def can_connect(port):
     try:
         s.connect(('localhost', port))
         return True
-    except socket.error, e:
+    except socket.error as e:
         return False
     finally:
         s.close()
@@ -86,7 +88,7 @@ def can_bind(port, proto):
     try:
         s.bind(('localhost', port))
         return True
-    except socket.error, e:
+    except socket.error as e:
         return False
     finally:
         s.close()
@@ -95,7 +97,7 @@ def can_bind(port, proto):
 def refill_pool(max_timeout, req):
     """Scan for ports not marked for being in use"""
     chk = [
-        port for port in list(range(1025, 32766))
+        port for port in range(1025, 32766)
         if port not in cronet_restricted_ports
     ]
     random.shuffle(chk)
diff --git a/tools/run_tests/python_utils/report_utils.py b/tools/run_tests/python_utils/report_utils.py
index b2a256ce29..bf1f7374e2 100644
--- a/tools/run_tests/python_utils/report_utils.py
+++ b/tools/run_tests/python_utils/report_utils.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 """Generate XML and HTML test reports."""
 
-from __future__ import print_function
+
 
 try:
     from mako.runtime import Context
@@ -33,9 +33,7 @@ def _filter_msg(msg, output_format):
     if output_format in ['XML', 'HTML']:
         # keep whitespaces but remove formfeed and vertical tab characters
         # that make XML report unparseable.
-        filtered_msg = filter(
-            lambda x: x in string.printable and x != '\f' and x != '\v',
-            msg.decode('UTF-8', 'ignore'))
+        filtered_msg = [x for x in msg.decode('UTF-8', 'ignore') if x in string.printable and x != '\f' and x != '\v']
         if output_format == 'HTML':
             filtered_msg = filtered_msg.replace('"', '"')
         return filtered_msg
diff --git a/tools/run_tests/python_utils/start_port_server.py b/tools/run_tests/python_utils/start_port_server.py
index 37995acbdf..247400bc7a 100644
--- a/tools/run_tests/python_utils/start_port_server.py
+++ b/tools/run_tests/python_utils/start_port_server.py
@@ -12,8 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import urllib
-import jobset
+from __future__ import print_function
+
+from . import jobset
+
+import six.moves.urllib.request as request
 import logging
 import os
 import socket
@@ -33,7 +36,7 @@ def start_port_server():
     # otherwise, leave it up
     try:
         version = int(
-            urllib.urlopen('http://localhost:%d/version_number' %
+            request.urlopen('http://localhost:%d/version_number' %
                            _PORT_SERVER_PORT).read())
         logging.info('detected port server running version %d', version)
         running = True
@@ -51,7 +54,7 @@ def start_port_server():
         running = (version >= current_version)
         if not running:
             logging.info('port_server version mismatch: killing the old one')
-            urllib.urlopen(
+            request.urlopen(
                 'http://localhost:%d/quitquitquit' % _PORT_SERVER_PORT).read()
             time.sleep(1)
     if not running:
@@ -92,7 +95,7 @@ def start_port_server():
                 # try one final time: maybe another build managed to start one
                 time.sleep(1)
                 try:
-                    urllib.urlopen(
+                    request.urlopen(
                         'http://localhost:%d/get' % _PORT_SERVER_PORT).read()
                     logging.info(
                         'last ditch attempt to contact port server succeeded')
@@ -101,11 +104,11 @@ def start_port_server():
                     logging.exception(
                         'final attempt to contact port server failed')
                     port_log = open(logfile, 'r').read()
-                    print port_log
+                    print(port_log)
                     sys.exit(1)
             try:
                 port_server_url = 'http://localhost:%d/get' % _PORT_SERVER_PORT
-                urllib.urlopen(port_server_url).read()
+                request.urlopen(port_server_url).read()
                 logging.info('port server is up and ready')
                 break
             except socket.timeout:
diff --git a/tools/run_tests/python_utils/watch_dirs.py b/tools/run_tests/python_utils/watch_dirs.py
index d2ad303a07..f2f1c006df 100755
--- a/tools/run_tests/python_utils/watch_dirs.py
+++ b/tools/run_tests/python_utils/watch_dirs.py
@@ -15,13 +15,14 @@
 
 import os
 import time
+from six import string_types
 
 
 class DirWatcher(object):
     """Helper to watch a (set) of directories for modifications."""
 
     def __init__(self, paths):
-        if isinstance(paths, basestring):
+        if isinstance(paths, string_types):
             paths = [paths]
         self._done = False
         self.paths = list(paths)