Uh oh!
There was an error while loading. Please reload this page.
gh-100176: Mac/build-installer: Remove redundant compat code for Python 3.5 and older - #100297
Closed
hugovk wants to merge 1 commit into
Closed
gh-100176: Mac/build-installer: Remove redundant compat code for Python 3.5 and older#100297hugovk wants to merge 1 commit into
hugovk wants to merge 1 commit into
Conversation
Python 3.5 has been EOL since 2020-09-13 and 2.7 since 2020-01-01, so we can remove these old compatibility checks.
Comment on lines
+1266
to
+1275
| fp = open(os.path.join(buildDir, 'Makefile'), 'r') | ||
| for ln in fp: | ||
| if ln.startswith('VERSION='): | ||
| VERSION=ln.split()[1] | ||
| if ln.startswith('ABIFLAGS='): | ||
| ABIFLAGS=ln.split() | ||
| ABIFLAGS=ABIFLAGS[1] if len(ABIFLAGS) > 1 else '' | ||
| if ln.startswith('LDVERSION='): | ||
| LDVERSION=ln.split()[1] | ||
| fp.close() |
Member
There was a problem hiding this comment.
Might as well modernise this 12-year-old code while we're here, since we're touching these lines anyway?
Suggested change
| fp=open(os.path.join(buildDir, 'Makefile'), 'r') | |
| forlninfp: | |
| ifln.startswith('VERSION='): | |
| VERSION=ln.split()[1] | |
| ifln.startswith('ABIFLAGS='): | |
| ABIFLAGS=ln.split() | |
| ABIFLAGS=ABIFLAGS[1] iflen(ABIFLAGS) >1else'' | |
| ifln.startswith('LDVERSION='): | |
| LDVERSION=ln.split()[1] | |
| fp.close() | |
| withopen(os.path.join(buildDir, 'Makefile'), 'r') asfp: | |
| forlninfp: | |
| ifln.startswith('VERSION='): | |
| VERSION=ln.split()[1] | |
| ifln.startswith('ABIFLAGS='): | |
| ABIFLAGS=ln.split() | |
| ABIFLAGS=ABIFLAGS[1] iflen(ABIFLAGS) >1else'' | |
| ifln.startswith('LDVERSION='): | |
| LDVERSION=ln.split()[1] |
(This might actually result in a smaller PR diff as well, as a bonus.)
ned-deily
commented
Dec 16, 2022
Member
Thanks for your efforts but I would prefer to leave build-installer.py untouched for now. I will be making much more substantial changes to it later in the current release cycle and for now it's easier to keep it in sync with other active versions. |
hugovk
commented
Dec 16, 2022
MemberAuthor
Sure! Let's close this. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Python 3.5 has been EOL since 2020-09-13 and 2.7 since 2020-01-01, so we can remove these old compatibility checks.
https://devguide.python.org/versions/