##// END OF EJS Templates
tests: remove last references to PYTHON3...
Gregory Szorc -
r49721:2ccd5e71 default
parent child Browse files
Show More
@@ -163,7 +163,6 b' if sys.version_info < (3, 5, 0):'
163 )
163 )
164 sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
164 sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
165
165
166 PYTHON3 = True
167 xrange = range # we use xrange in one place, and we'd rather not use range
166 xrange = range # we use xrange in one place, and we'd rather not use range
168
167
169
168
@@ -1464,7 +1463,7 b' class Test(unittest.TestCase):'
1464 # This has the same effect as Py_LegacyWindowsStdioFlag in exewrapper.c,
1463 # This has the same effect as Py_LegacyWindowsStdioFlag in exewrapper.c,
1465 # but this is needed for testing python instances like dummyssh,
1464 # but this is needed for testing python instances like dummyssh,
1466 # dummysmtpd.py, and dumbhttp.py.
1465 # dummysmtpd.py, and dumbhttp.py.
1467 if PYTHON3 and WINDOWS:
1466 if WINDOWS:
1468 env['PYTHONLEGACYWINDOWSSTDIO'] = '1'
1467 env['PYTHONLEGACYWINDOWSSTDIO'] = '1'
1469
1468
1470 # Modified HOME in test environment can confuse Rust tools. So set
1469 # Modified HOME in test environment can confuse Rust tools. So set
@@ -3414,7 +3413,7 b' class TestRunner(object):'
3414
3413
3415 failed = False
3414 failed = False
3416 kws = self.options.keywords
3415 kws = self.options.keywords
3417 if kws is not None and PYTHON3:
3416 if kws is not None:
3418 kws = kws.encode('utf-8')
3417 kws = kws.encode('utf-8')
3419
3418
3420 suite = TestSuite(
3419 suite = TestSuite(
General Comments 0
You need to be logged in to leave comments. Login now