bpo-46775: OSError should call winerror_to_errno unconditionally on Windows (GH-32179)

(cherry picked from commit d0c67ea0645b7ad37b867c167882a346a24de641)

Co-authored-by: Dong-hee Na <donghee.na@python.org>

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst b/Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst
new file mode 100644 (file)
index 0000000..da56ecd
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-03-30-02-36-25.bpo-46775.e3Oxqf.rst
@@ -0,0 +1,3 @@
+Some Windows system error codes(>= 10000) are now mapped into
+the correct errno and may now raise a subclass of :exc:`OSError`.
+Patch by Dong-hee Na.

diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index e67ecfab858fba06f830411d891b08864dd27cdd..57ddbb00121342fed285b10238543901209f242f 100644 (file)
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -844,14 +844,7 @@ oserror_parse_args(PyObject **p_args,
             winerrcode = PyLong_AsLong(*winerror);
             if (winerrcode == -1 && PyErr_Occurred())
                 return -1;
-            /* Set errno to the corresponding POSIX errno (overriding
-               first argument).  Windows Socket error codes (>= 10000)
-               have the same value as their POSIX counterparts.
-            */
-            if (winerrcode < 10000)
-                errcode = winerror_to_errno(winerrcode);
-            else
-                errcode = winerrcode;
+            errcode = winerror_to_errno(winerrcode);
             *myerrno = PyLong_FromLong(errcode);
             if (!*myerrno)
                 return -1;