diff --git a/mypy/config_parser.py b/mypy/config_parser.py index 52b41d6ee2f7..fd20ef71a94f 100644 --- a/mypy/config_parser.py +++ b/mypy/config_parser.py @@ -42,9 +42,8 @@ def parse_version(v: Union[str, float]) -> Tuple[int, int]: if not m: raise argparse.ArgumentTypeError(f"Invalid python version '{v}' (expected format: 'x.y')") major, minor = int(m.group(1)), int(m.group(2)) - if major == 2: - if minor != 7: - raise argparse.ArgumentTypeError(f"Python 2.{minor} is not supported (must be 2.7)") + if major == 2 and minor == 7: + pass # Error raised elsewhere elif major == 3: if minor < defaults.PYTHON3_VERSION_MIN[1]: msg = "Python 3.{0} is not supported (must be {1}.{2} or higher)".format( @@ -57,7 +56,7 @@ def parse_version(v: Union[str, float]) -> Tuple[int, int]: raise argparse.ArgumentTypeError(msg) else: raise argparse.ArgumentTypeError( - f"Python major version '{major}' out of range (must be 2 or 3)" + f"Python major version '{major}' out of range (must be 3)" ) return major, minor diff --git a/test-data/unit/cmdline.test b/test-data/unit/cmdline.test index 020f06dbea24..81c478feeb3f 100644 --- a/test-data/unit/cmdline.test +++ b/test-data/unit/cmdline.test @@ -604,16 +604,7 @@ pyproject.toml: [mypy]: python_version: Python 3.1 is not supported (must be 3.4 \[mypy] python_version = 1.0 [out] -mypy.ini: [mypy]: python_version: Python major version '1' out of range (must be 2 or 3) -== Return code: 0 - -[case testPythonVersionTooOld26] -# cmd: mypy -c pass -[file mypy.ini] -\[mypy] -python_version = 2.6 -[out] -mypy.ini: [mypy]: python_version: Python 2.6 is not supported (must be 2.7) +mypy.ini: [mypy]: python_version: Python major version '1' out of range (must be 3) == Return code: 0 [case testPythonVersionTooOld33] @@ -625,25 +616,16 @@ python_version = 3.3 mypy.ini: [mypy]: python_version: Python 3.3 is not supported (must be 3.4 or higher) == Return code: 0 -[case testPythonVersionTooNew28] -# cmd: mypy -c pass -[file mypy.ini] -\[mypy] -python_version = 2.8 -[out] -mypy.ini: [mypy]: python_version: Python 2.8 is not supported (must be 2.7) -== Return code: 0 - [case testPythonVersionTooNew40] # cmd: mypy -c pass [file mypy.ini] \[mypy] python_version = 4.0 [out] -mypy.ini: [mypy]: python_version: Python major version '4' out of range (must be 2 or 3) +mypy.ini: [mypy]: python_version: Python major version '4' out of range (must be 3) == Return code: 0 -[case testPythonVersionAccepted27] +[case testPythonVersionTooDead27] # cmd: mypy -c pass [file mypy.ini] \[mypy]