PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy.
diff --git a/Python/errors.c b/Python/errors.c
index 02f84b4..6e69d23 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -496,10 +496,11 @@
         return NULL;
     }
 
-    if (filenameObject != NULL)
-        v = Py_BuildValue("(iOO)", err, message, filenameObject);
-    else
-        v = Py_BuildValue("(iO)", err, message);
+    if (filenameObject == NULL)
+        filenameObject = Py_None;
+    /* This is the constructor signature for passing a Windows error code.
+       The POSIX translation will be figured out by the constructor. */
+    v = Py_BuildValue("(iOOi)", 0, message, filenameObject, err);
     Py_DECREF(message);
 
     if (v != NULL) {