From 45e3931a2a9ffcc3b99c2fb00f22c89bb3f00402 Mon Sep 17 00:00:00 2001 From: cclauss Date: Wed, 24 Apr 2019 03:59:18 -0400 Subject: [PATCH 1/2] Remove the unsupported Python 2.6 from configure A precursor to #25878 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 495d0e8848860c..d6cb3bd65a94de 100755 --- a/configure +++ b/configure @@ -13,10 +13,10 @@ del _ import sys from distutils.spawn import find_executable as which -if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7): - sys.stderr.write('Please use either Python 2.6 or 2.7') +if sys.version_info[:2] != (2, 7): + sys.stderr.write('Please use either Python 2.7') - python2 = which('python2') or which('python2.6') or which('python2.7') + python2 = which('python2') or which('python2.7') if python2: sys.stderr.write(':\n\n') From 81307b2051311f786d56ea5466cf228ffa870226 Mon Sep 17 00:00:00 2001 From: cclauss Date: Wed, 24 Apr 2019 04:02:33 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Remove=20=E2=80=98either=E2=80=99=20because?= =?UTF-8?q?=20there=20is=20no=20choice=20but=20Python=202.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d6cb3bd65a94de..9156e13f7aed0d 100755 --- a/configure +++ b/configure @@ -14,7 +14,7 @@ del _ import sys from distutils.spawn import find_executable as which if sys.version_info[:2] != (2, 7): - sys.stderr.write('Please use either Python 2.7') + sys.stderr.write('Please use Python 2.7') python2 = which('python2') or which('python2.7')