aboutsummaryrefslogtreecommitdiff
path: root/Misc
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-06-29 05:07:41 -0700
committerGitHub <noreply@github.com>2020-06-29 05:07:41 -0700
commit7731139b7af655b9f5df6d1b5493f8dfdf41d569 (patch)
tree54720f127940f2f0c02bef2fe86b36159a74e8ba /Misc
parentUpdate ssl.rst (diff)
downloadcpython-7731139b7af655b9f5df6d1b5493f8dfdf41d569.tar.gz
cpython-7731139b7af655b9f5df6d1b5493f8dfdf41d569.tar.bz2
cpython-7731139b7af655b9f5df6d1b5493f8dfdf41d569.zip
bpo-41048: mimetypes should read the rule file using UTF-8, not the locale encoding (GH-20998)
(cherry picked from commit 7f569c9bc0079906012b3034d30fe8abc742e7fc) Co-authored-by: Srinivas Reddy Thatiparthy (శ్రీనివాస్ రెడ్డి తాటిపర్తి) <thatiparthysreenivas@gmail.com>
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS.d/next/Library/2020-06-20-10-16-57.bpo-41048.hEXB-B.rst2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 8098637a32c..a08e917b307 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1669,6 +1669,7 @@ Mikhail Terekhov
Victor Terrón
Pablo Galindo
Richard M. Tew
+Srinivas Reddy Thatiparthy
Tobias Thelen
Christian Theune
Févry Thibault
diff --git a/Misc/NEWS.d/next/Library/2020-06-20-10-16-57.bpo-41048.hEXB-B.rst b/Misc/NEWS.d/next/Library/2020-06-20-10-16-57.bpo-41048.hEXB-B.rst
new file mode 100644
index 00000000000..2595900137d
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-06-20-10-16-57.bpo-41048.hEXB-B.rst
@@ -0,0 +1,2 @@
+:func:`mimetypes.read_mime_types` function reads the rule file using UTF-8 encoding, not the locale encoding.
+Patch by Srinivas Reddy Thatiparthy. \ No newline at end of file