Skip to content

bpo-41048: mimetypes should read the rule file using UTF-8, not the locale encoding#20998

Merged
serhiy-storchaka merged 6 commits into
python:masterfrom
srinivasreddy:bpo-41048
Jun 29, 2020
Merged

bpo-41048: mimetypes should read the rule file using UTF-8, not the locale encoding#20998
serhiy-storchaka merged 6 commits into
python:masterfrom
srinivasreddy:bpo-41048

Conversation

@srinivasreddy
Copy link
Copy Markdown
Contributor

@srinivasreddy srinivasreddy commented Jun 20, 2020 •
edited by bedevere-bot
Loading

@srinivasreddy srinivasreddy requested a review from a team as a code owner June 20, 2020 09:56
corona10
corona10 requested changes Jun 20, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@corona10 corona10 left a comment

Choose a reason for hiding this comment

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

@srinivasreddy

Thanks for the contribution,
Please add the NEWS.d by using blurb :)

guide: https://devguide.python.org/committing/#what-s-new-and-news-entries

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 20, 2020

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@srinivasreddy
Copy link
Copy Markdown
Contributor Author

srinivasreddy commented Jun 20, 2020

@corona10 Done

serhiy-storchaka
serhiy-storchaka requested changes Jun 20, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

Please add tests.

Comment thread Misc/NEWS.d/next/Library/2020-06-20-10-16-57.bpo-41048.hEXB-B.rst Outdated
serhiy-storchaka
serhiy-storchaka reviewed Jun 21, 2020
View reviewed changes
Comment thread Lib/test/test_mimetypes.py Outdated
Comment thread Lib/test/test_mimetypes.py Outdated
@srinivasreddy
Copy link
Copy Markdown
Contributor Author

srinivasreddy commented Jun 21, 2020

@serhiy-storchaka done. Thanks a lot

@serhiy-storchaka serhiy-storchaka merged commit 7f569c9 into python:master Jun 29, 2020
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jun 29, 2020

Thanks @srinivasreddy for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8, 3.9.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 29, 2020
@srinivasreddy @miss-islington
bpo-41048: mimetypes should read the rule file using UTF-8, not the l…
c8a881e 
…ocale encoding (pythonGH-20998)

(cherry picked from commit 7f569c9)

Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్  రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 29, 2020

GH-21210 is a backport of this pull request to the 3.9 branch.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 29, 2020

GH-21211 is a backport of this pull request to the 3.8 branch.

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jun 29, 2020

Sorry, @srinivasreddy and @serhiy-storchaka, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 7f569c9bc0079906012b3034d30fe8abc742e7fc 3.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 29, 2020
@srinivasreddy @miss-islington
bpo-41048: mimetypes should read the rule file using UTF-8, not the l…
165f336 
…ocale encoding (pythonGH-20998)

(cherry picked from commit 7f569c9)

Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్  రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
miss-islington added a commit that referenced this pull request Jun 29, 2020
@miss-islington @srinivasreddy
bpo-41048: mimetypes should read the rule file using UTF-8, not the l…
9e36b6e 
…ocale encoding (GH-20998)

(cherry picked from commit 7f569c9)

Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్  రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
miss-islington added a commit that referenced this pull request Jun 29, 2020
@miss-islington @srinivasreddy
bpo-41048: mimetypes should read the rule file using UTF-8, not the l…
7731139 
…ocale encoding (GH-20998)

(cherry picked from commit 7f569c9)

Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్  రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
fasih pushed a commit to fasih/cpython that referenced this pull request Jun 29, 2020
@srinivasreddy @fasihahmad
bpo-41048: mimetypes should read the rule file using UTF-8, not the l…
0d6d28c 
…ocale encoding (pythonGH-20998)
@srinivasreddy srinivasreddy deleted the bpo-41048 branch June 29, 2020 21:49
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jun 30, 2020

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

@serhiy-storchaka serhiy-storchaka removed their assignment Dec 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@corona10 corona10 corona10 requested changes

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@srinivasreddy @bedevere-bot @miss-islington @serhiy-storchaka @corona10 @the-knights-who-say-ni