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.

Sign up for GitHub

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-34604: Fix possible mojibake in pwd.getpwnam and grp.getgrnam #9098

Merged
merged 2 commits into from
Sep 7, 2018
Merged

bpo-34604: Fix possible mojibake in pwd.getpwnam and grp.getgrnam #9098

merged 2 commits into from
Sep 7, 2018

Conversation

william-gr
Copy link
Contributor

@william-gr william-gr commented Sep 7, 2018 •
edited by bedevere-bot
Loading

@william-gr
Copy link
Contributor Author

@vstinner here is the follow up PR as discussed in #7081

Please let me know if thats what you were meaning.

Thanks!

@william-gr
Copy link
Contributor Author

william-gr commented Sep 7, 2018 •
edited
Loading

The build failed probably because I changed pwd.getpwnam signature from arg: unicode to name: unicode, however I am unsure how to fix that. Investigating.

vstinner
vstinner reviewed Sep 7, 2018
View reviewed changes
Misc/NEWS.d/next/Library/2018-09-07-10-16-34.bpo-34604.xL7-kG.rst Outdated
@@ -0,0 +1,2 @@
Fix possible mojibake in `pwd.getpwnam` and `grp.getgrnam`. Patch by William
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would you mind to add "... in the error message." to clarify that it doesn't affect the regular case?

@william-gr
Copy link
Contributor Author

@vstinner sure, updated.

Thanks

@vstinner vstinner merged commit 2865848 into python:master Sep 7, 2018
@miss-islington
Copy link
Contributor

Thanks @william-gr for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Thanks @william-gr for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @william-gr and @vstinner, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 28658485a54ad5f9df52ecc12d9046269f1654ec 3.6

@miss-islington
Copy link
Contributor

Sorry, @william-gr and @vstinner, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 28658485a54ad5f9df52ecc12d9046269f1654ec 3.7

@vstinner
Copy link
Member

vstinner commented Sep 7, 2018

@william-gr: it seems like the the bot failed to backport the fix. Would you mind to try to create 3.6 and 3.7 backport pull requests?

@william-gr william-gr deleted the grp-pwd-mojibake branch September 7, 2018 17:30
@bedevere-bot
Copy link

GH-9104 is a backport of this pull request to the 3.7 branch.

@bedevere-bot
Copy link

GH-9105 is a backport of this pull request to the 3.6 branch.

william-gr added a commit to william-gr/cpython that referenced this pull request Sep 8, 2018
@william-gr
[3.7] bpo-34604: Fix possible mojibake in pwd.getpwnam() and grp.getg…
a7b3445 
…rnam() (pythonGH-9098)

Pass the user/group name as Unicode to the formatting function,
instead of always decoding a bytes string from UTF-8..
(cherry picked from commit 2865848)

Co-authored-by: William Grzybowski <wg@FreeBSD.org>
william-gr added a commit to william-gr/cpython that referenced this pull request Sep 8, 2018
@william-gr
[3.6] bpo-34604: Fix possible mojibake in pwd.getpwnam() and grp.getg…
788bf8a 
…rnam() (pythonGH-9098)

Pass the user/group name as Unicode to the formatting function,
instead of always decoding a bytes string from UTF-8..
(cherry picked from commit 2865848)

Co-authored-by: William Grzybowski <wg@FreeBSD.org>
vstinner pushed a commit that referenced this pull request Sep 9, 2018
@william-gr @vstinner
[3.6] bpo-34604: Fix possible mojibake in pwd.getpwnam() and grp.getg…
1bcd891 
…rnam() (GH-9098) (GH-9105)

Pass the user/group name as Unicode to the formatting function,
instead of always decoding a bytes string from UTF-8..
(cherry picked from commit 2865848)

Co-authored-by: William Grzybowski <wg@FreeBSD.org>
vstinner pushed a commit that referenced this pull request Sep 9, 2018
@william-gr @vstinner
[3.7] bpo-34604: Fix possible mojibake in pwd.getpwnam() and grp.getg…
7a633ed 
…rnam() (GH-9098) (GH-9104)

Pass the user/group name as Unicode to the formatting function,
instead of always decoding a bytes string from UTF-8..
(cherry picked from commit 2865848)

Co-authored-by: William Grzybowski <wg@FreeBSD.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner vstinner left review comments

Assignees

@vstinner vstinner

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@william-gr @miss-islington @vstinner @bedevere-bot @the-knights-who-say-ni