##// END OF EJS Templates
run-tests: remove references to Python 2.6...
Gregory Szorc -
r32353:4bffe242 default
parent child Browse files
Show More
@@ -90,7 +90,7 b' if sys.version_info > (3, 5, 0):'
90 return p.decode('utf-8')
90 return p.decode('utf-8')
91
91
92 elif sys.version_info >= (3, 0, 0):
92 elif sys.version_info >= (3, 0, 0):
93 print('%s is only supported on Python 3.5+ and 2.6-2.7, not %s' %
93 print('%s is only supported on Python 3.5+ and 2.7, not %s' %
94 (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
94 (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
95 sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
95 sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
96 else:
96 else:
@@ -317,7 +317,7 b' def getparser():'
317 parser.add_option("--ipv6", action="store_true",
317 parser.add_option("--ipv6", action="store_true",
318 help="prefer IPv6 to IPv4 for network related tests")
318 help="prefer IPv6 to IPv4 for network related tests")
319 parser.add_option("-3", "--py3k-warnings", action="store_true",
319 parser.add_option("-3", "--py3k-warnings", action="store_true",
320 help="enable Py3k warnings on Python 2.6+")
320 help="enable Py3k warnings on Python 2.7+")
321 # This option should be deleted once test-check-py3-compat.t and other
321 # This option should be deleted once test-check-py3-compat.t and other
322 # Python 3 tests run with Python 3.
322 # Python 3 tests run with Python 3.
323 parser.add_option("--with-python3", metavar="PYTHON3",
323 parser.add_option("--with-python3", metavar="PYTHON3",
@@ -435,7 +435,7 b' def parseargs(args, parser):'
435 if options.py3k_warnings:
435 if options.py3k_warnings:
436 if PYTHON3:
436 if PYTHON3:
437 parser.error(
437 parser.error(
438 '--py3k-warnings can only be used on Python 2.6 and 2.7')
438 '--py3k-warnings can only be used on Python 2.7')
439 if options.with_python3:
439 if options.with_python3:
440 if PYTHON3:
440 if PYTHON3:
441 parser.error('--with-python3 cannot be used when executing with '
441 parser.error('--with-python3 cannot be used when executing with '
General Comments 0
You need to be logged in to leave comments. Login now