tools: prepare tools/testp.py for Python 3

cclauss · BethGriggs · commit b60808a2da97 · 2018-12-17T23:16:03.000Z
PR-URL: #24890 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
diff --git a/tools/test.py b/tools/test.py
@@ -44,21 +44,26 @@
 import multiprocessing
 import errno
 import copy
-import ast
 
 from os.path import join, dirname, abspath, basename, isdir, exists
 from datetime import datetime
 from Queue import Queue, Empty
 
 try:
- reduce # Python 2
+ cmp # Python 2
+except NameError:
+ def cmp(x, y): # Python 3
+ return (x > y) - (x < y)
+
+try:
+ reduce # Python 2
 except NameError: # Python 3
 from functools import reduce
 
 try:
- xrange # Python 2
+ xrange # Python 2
 except NameError:
- xrange = range # Python 3
+ xrange = range # Python 3
 
 logger = logging.getLogger('testrunner')
 skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)

-Original file line number
+Diff line change
 importmultiprocessing
 importerrno
 importcopy
 -importast
 fromos.pathimportjoin, dirname, abspath, basename, isdir, exists
 fromdatetimeimportdatetime
 fromQueueimportQueue, Empty
 try:
 -reduce# Python 2
 +cmp# Python 2
 +exceptNameError:
 +defcmp(x, y): # Python 3
 +return (x>y) - (x<y)
++
 +try:
 +reduce# Python 2
 exceptNameError: # Python 3
 fromfunctoolsimportreduce
 try:
 -xrange# Python 2
 +xrange# Python 2
 exceptNameError:
 -xrange=range# Python 3
 +xrange=range# Python 3
 logger=logging.getLogger('testrunner')
 skip_regex=re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)