diff options
| author | Mike Frysinger <vapier@google.com> | 2023-10-14 01:10:29 +0545 |
|---|---|---|
| committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-10-13 20:08:33 +0000 |
| commit | 8f4f98582ef5f99db96e383400c3acf85e0eeb52 (patch) | |
| tree | 9cbbecf9ac96ab99e8c0d13de65351b082dcdfde | |
| parent | 8bc5000423aef45900b7fba112458ed586e13251 (diff) | |
| download | git-repo-8f4f98582ef5f99db96e383400c3acf85e0eeb52.tar.gz | |
main: drop Python 2 check
Python 2 can't even parse this code anymore due to syntax changes,
so there's no point in checking for it explicitly.
Bug: 302871152
Change-Id: I9852ace5f5079d037c60fd3ac490d77e074e6875
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/389434
Commit-Queue: Mike Frysinger <vapier@google.com>
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
| -rwxr-xr-x | main.py | 24 |
1 files changed, 8 insertions, 16 deletions
| @@ -86,27 +86,19 @@ logger = RepoLogger(__file__) | |||
| 86 | MIN_PYTHON_VERSION_SOFT = (3, 6) | 86 | MIN_PYTHON_VERSION_SOFT = (3, 6) |
| 87 | MIN_PYTHON_VERSION_HARD = (3, 6) | 87 | MIN_PYTHON_VERSION_HARD = (3, 6) |
| 88 | 88 | ||
| 89 | if sys.version_info.major < 3: | 89 | if sys.version_info < MIN_PYTHON_VERSION_HARD: |
| 90 | logger.error( | 90 | logger.error( |
| 91 | "repo: error: Python 2 is no longer supported; " | 91 | "repo: error: Python version is too old; " |
| 92 | "Please upgrade to Python %d.%d+.", | 92 | "Please upgrade to Python %d.%d+.", |
| 93 | *MIN_PYTHON_VERSION_SOFT, | 93 | *MIN_PYTHON_VERSION_SOFT, |
| 94 | ) | 94 | ) |
| 95 | sys.exit(1) | 95 | sys.exit(1) |
| 96 | else: | 96 | elif sys.version_info < MIN_PYTHON_VERSION_SOFT: |
| 97 | if sys.version_info < MIN_PYTHON_VERSION_HARD: | 97 | logger.error( |
| 98 | logger.error( | 98 | "repo: warning: your Python version is no longer supported; " |
| 99 | "repo: error: Python 3 version is too old; " | 99 | "Please upgrade to Python %d.%d+.", |
| 100 | "Please upgrade to Python %d.%d+.", | 100 | *MIN_PYTHON_VERSION_SOFT, |
| 101 | *MIN_PYTHON_VERSION_SOFT, | 101 | ) |
| 102 | ) | ||
| 103 | sys.exit(1) | ||
| 104 | elif sys.version_info < MIN_PYTHON_VERSION_SOFT: | ||
| 105 | logger.error( | ||
| 106 | "repo: warning: your Python 3 version is no longer supported; " | ||
| 107 | "Please upgrade to Python %d.%d+.", | ||
| 108 | *MIN_PYTHON_VERSION_SOFT, | ||
| 109 | ) | ||
| 110 | 102 | ||
| 111 | KEYBOARD_INTERRUPT_EXIT = 128 + signal.SIGINT | 103 | KEYBOARD_INTERRUPT_EXIT = 128 + signal.SIGINT |
| 112 | MAX_PRINT_ERRORS = 5 | 104 | MAX_PRINT_ERRORS = 5 |
