Patchwork run-tests: remove references to Python 2.6

login
register
mail settings
Submitter Gregory Szorc
Date May 20, 2017, 2:47 a.m.
Message ID <34e910bfaf2516cbc20d.1495248450@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/20753/
State Accepted
Headers show

Comments

Gregory Szorc - May 20, 2017, 2:47 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1495248405 25200
#      Fri May 19 19:46:45 2017 -0700
# Node ID 34e910bfaf2516cbc20d7437bcfb78af56650665
# Parent  a438f5a3bc092f54e14f45e2115a36312c2ed302
run-tests: remove references to Python 2.6

These are the obvious ones. There is tons of code in this file
implementing features from unittest that weren't present in
Python 2.6. But that's for other patches.
Yuya Nishihara - May 20, 2017, 3:53 a.m.
On Fri, 19 May 2017 19:47:30 -0700, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1495248405 25200
> #      Fri May 19 19:46:45 2017 -0700
> # Node ID 34e910bfaf2516cbc20d7437bcfb78af56650665
> # Parent  a438f5a3bc092f54e14f45e2115a36312c2ed302
> run-tests: remove references to Python 2.6

Queued, thanks.

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -90,7 +90,7 @@  if sys.version_info > (3, 5, 0):
         return p.decode('utf-8')
 
 elif sys.version_info >= (3, 0, 0):
-    print('%s is only supported on Python 3.5+ and 2.6-2.7, not %s' %
+    print('%s is only supported on Python 3.5+ and 2.7, not %s' %
           (sys.argv[0], '.'.join(str(v) for v in sys.version_info[:3])))
     sys.exit(70) # EX_SOFTWARE from `man 3 sysexit`
 else:
@@ -317,7 +317,7 @@  def getparser():
     parser.add_option("--ipv6", action="store_true",
                       help="prefer IPv6 to IPv4 for network related tests")
     parser.add_option("-3", "--py3k-warnings", action="store_true",
-        help="enable Py3k warnings on Python 2.6+")
+        help="enable Py3k warnings on Python 2.7+")
     # This option should be deleted once test-check-py3-compat.t and other
     # Python 3 tests run with Python 3.
     parser.add_option("--with-python3", metavar="PYTHON3",
@@ -435,7 +435,7 @@  def parseargs(args, parser):
     if options.py3k_warnings:
         if PYTHON3:
             parser.error(
-                '--py3k-warnings can only be used on Python 2.6 and 2.7')
+                '--py3k-warnings can only be used on Python 2.7')
     if options.with_python3:
         if PYTHON3:
             parser.error('--with-python3 cannot be used when executing with '