git-p4: make python2.7 the oldest supported version

Python2.6 and earlier have been end-of-life'd for many years now, and
we actually already use 2.7-only features in the code. Make the version
check reflect current realities.

This also removes the need to explicitly define CalledProcessError if
it's not available.

Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Yang Zhao 2019-12-13 15:52:35 -08:00 коммит произвёл Junio C Hamano
Родитель 559c6fc317
Коммит 0b4396f068
1 изменённых файлов: 2 добавлений и 18 удалений

Просмотреть файл

@ -8,9 +8,8 @@
# License: MIT <http://www.opensource.org/licenses/mit-license.php> # License: MIT <http://www.opensource.org/licenses/mit-license.php>
# #
import sys import sys
if sys.hexversion < 0x02040000: if sys.version_info.major < 3 and sys.version_info.minor < 7:
# The limiter is the subprocess module sys.stderr.write("git-p4: requires Python 2.7 or later.\n")
sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
sys.exit(1) sys.exit(1)
import os import os
import optparse import optparse
@ -43,21 +42,6 @@ else:
bytes = str bytes = str
basestring = basestring basestring = basestring
try:
from subprocess import CalledProcessError
except ImportError:
# from python2.7:subprocess.py
# Exception classes used by this module.
class CalledProcessError(Exception):
"""This exception is raised when a process run by check_call() returns
a non-zero exit status. The exit status will be stored in the
returncode attribute."""
def __init__(self, returncode, cmd):
self.returncode = returncode
self.cmd = cmd
def __str__(self):
return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
verbose = False verbose = False
# Only labels/tags matching this will be imported/exported # Only labels/tags matching this will be imported/exported