]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-100256: Skip inaccessible registry keys in the WinAPI mimetype implementation...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 7 Aug 2024 18:39:51 +0000 (20:39 +0200)
committerGitHub <noreply@github.com>
Wed, 7 Aug 2024 18:39:51 +0000 (19:39 +0100)
(cherry picked from commit 0bd93755f37e6b8beb597787fce39eb141179965)

Co-authored-by: Lucas Esposito <LucasEsposito@users.noreply.github.com>
Misc/ACKS
Misc/NEWS.d/next/Windows/2024-07-19-21-50-54.gh-issue-100256.GDrKba.rst [new file with mode: 0644]
Modules/_winapi.c

index 20ea85c4addeced22f6cfd7962a691d38476aab6..15d4470e2842cf38ca2259fa26603265db5e3def 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -516,6 +516,7 @@ Michael Ernst
 Ben Escoto
 Andy Eskilsson
 AndrĂ© Espaze
+Lucas Esposito
 Stefan Esser
 Nicolas Estibals
 Jonathan Eunice
diff --git a/Misc/NEWS.d/next/Windows/2024-07-19-21-50-54.gh-issue-100256.GDrKba.rst b/Misc/NEWS.d/next/Windows/2024-07-19-21-50-54.gh-issue-100256.GDrKba.rst
new file mode 100644 (file)
index 0000000..f0156dd
--- /dev/null
@@ -0,0 +1 @@
+:mod:`mimetypes` no longer fails when it encounters an inaccessible registry key.
index edb1181809c53b3e135cb5f8260a8c38cc7ca194..76f18c71a0713d6f54183507006ba67513a4c3ca 100644 (file)
@@ -2268,7 +2268,7 @@ _winapi__mimetypes_read_windows_registry_impl(PyObject *module,
         }
 
         err = RegOpenKeyExW(hkcr, ext, 0, KEY_READ, &subkey);
-        if (err == ERROR_FILE_NOT_FOUND) {
+        if (err == ERROR_FILE_NOT_FOUND || err == ERROR_ACCESS_DENIED) {
             err = ERROR_SUCCESS;
             continue;
         } else if (err != ERROR_SUCCESS) {