test: prepare test/pseudo-tty/testcfg.py Python 3

cclauss · BethGriggs · commit a67d37d226fe · 2019-02-12T20:06:23.000Z
PR-URL: #24887 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
diff --git a/test/pseudo-tty/testcfg.py b/test/pseudo-tty/testcfg.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -26,12 +25,19 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import print_function
+
 import test
 import os
 from os.path import join, exists, basename, isdir
 import re
 import utils
 
+try:
+ reduce # Python 2
+except NameError: # Python 3
+ from functools import reduce
+
 try:
 xrange # Python 2
 except NameError:

-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 -from __future__ importprint_function
 # Copyright 2008 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 +from __future__ importprint_function
++
 importtest
 importos
 fromos.pathimportjoin, exists, basename, isdir
 importre
 importutils
 +try:
 +reduce# Python 2
 +exceptNameError: # Python 3
 +fromfunctoolsimportreduce
++
 try:
 xrange# Python 2
 exceptNameError: