Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-44351: Restore back parse_makefile in distutils.sysconfig #26637

Merged
merged 1 commit into from Jun 11, 2021
Merged

bpo-44351: Restore back parse_makefile in distutils.sysconfig #26637

merged 1 commit into from Jun 11, 2021

Conversation

@frenzymadness
Copy link
Contributor

@frenzymadness frenzymadness commented Jun 10, 2021 •
edited by bedevere-bot

The function uses distutils.text_file.TextFile and therefore
behaves differently than _parse_makefile in sysconfig.

This is a regression caused by a try to merge distutils.sysconfig and sysconfig in #23142

https://bugs.python.org/issue44351
@frenzymadness
bpo-44351: Restore back parse_makefile in distutils.sysconfig
543e49f 
The function uses distutils.text_file.TextFile and therefore
behaves differently than _parse_makefile in sysconfig.
hroncok
hroncok approved these changes Jun 11, 2021
View changes
Copy link
Contributor

@hroncok hroncok left a comment

The code is different than Python 3.9 code wrt. compiled re patterns / strings. The differences are reasonable. Other than that, it is a straight revert / restore.

I'd add a regression test, however this is distutils, so not a hard requirement.

Thank you.

@encukou encukou merged commit fc98266 into python:main Jun 11, 2021
12 checks passed
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jun 11, 2021

Thanks @frenzymadness for the PR, and @encukou for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jun 11, 2021

GH-26673 is a backport of this pull request to the 3.10 branch.

miss-islington added a commit to miss-islington/cpython that referenced this issue Jun 11, 2021
@frenzymadness @miss-islington
bpo-44351: Restore back parse_makefile in distutils.sysconfig (python…
e2bab34 
…GH-26637)

The function uses distutils.text_file.TextFile and therefore
behaves differently than _parse_makefile in sysconfig.
(cherry picked from commit fc98266)

Co-authored-by: Lumír 'Frenzy' Balhar <lbalhar@redhat.com>
encukou pushed a commit that referenced this issue Jun 15, 2021
@frenzymadness @miss-islington
bpo-44351: Restore back parse_makefile in distutils.sysconfig (GH-26637…
2f2ea96 
…) (GH-26673)

The function uses distutils.text_file.TextFile and therefore
behaves differently than _parse_makefile in sysconfig.
(cherry picked from commit fc98266)

Co-authored-by: Lumír 'Frenzy' Balhar <lbalhar@redhat.com>
@pablogsal pablogsal mentioned this pull request Jul 18, 2021
Closed
JuniorJPDJ added a commit to JuniorJPDJ/cpython that referenced this issue Aug 12, 2021
@frenzymadness @JuniorJPDJ
bpo-44351: Restore back parse_makefile in distutils.sysconfig (python…
dc6ce78 
…GH-26637)

The function uses distutils.text_file.TextFile and therefore
behaves differently than _parse_makefile in sysconfig.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hroncok hroncok

Assignees
No one assigned
Labels
CLA signed
Projects
None yet
Milestone
No milestone
6 participants
@frenzymadness @miss-islington @bedevere-bot @hroncok @encukou @the-knights-who-say-ni