summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2023-10-14 01:10:29 +0545
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-10-13 20:08:33 +0000
commit8f4f98582ef5f99db96e383400c3acf85e0eeb52 (patch)
tree9cbbecf9ac96ab99e8c0d13de65351b082dcdfde
parent8bc5000423aef45900b7fba112458ed586e13251 (diff)
downloadgit-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-xmain.py24
1 files changed, 8 insertions, 16 deletions
diff --git a/main.py b/main.py
index 9c62722f..07c360f4 100755
--- a/main.py
+++ b/main.py
@@ -86,27 +86,19 @@ logger = RepoLogger(__file__)
86MIN_PYTHON_VERSION_SOFT = (3, 6) 86MIN_PYTHON_VERSION_SOFT = (3, 6)
87MIN_PYTHON_VERSION_HARD = (3, 6) 87MIN_PYTHON_VERSION_HARD = (3, 6)
88 88
89if sys.version_info.major < 3: 89if 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)
96else: 96elif 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
111KEYBOARD_INTERRUPT_EXIT = 128 + signal.SIGINT 103KEYBOARD_INTERRUPT_EXIT = 128 + signal.SIGINT
112MAX_PRINT_ERRORS = 5 104MAX_PRINT_ERRORS = 5