tools: prepare tools/testp.py for Python 3

PR-URL: https://github.com/nodejs/node/pull/24890
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
This commit is contained in:
cclauss 2018-12-07 11:04:24 +01:00 committed by Rich Trott
parent 44a5fe1457
commit 5906530834

View File

@ -44,21 +44,26 @@ import utils
import multiprocessing import multiprocessing
import errno import errno
import copy import copy
import ast
from os.path import join, dirname, abspath, basename, isdir, exists from os.path import join, dirname, abspath, basename, isdir, exists
from datetime import datetime from datetime import datetime
from Queue import Queue, Empty from Queue import Queue, Empty
try: 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 except NameError: # Python 3
from functools import reduce from functools import reduce
try: try:
xrange # Python 2 xrange # Python 2
except NameError: except NameError:
xrange = range # Python 3 xrange = range # Python 3
logger = logging.getLogger('testrunner') logger = logging.getLogger('testrunner')
skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE) skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)