From 0d534df115a126286c00ada64f26989814197fb5 Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 30 Apr 2020 01:44:50 +0900
Subject: [PATCH 1/5] bpo-1635741: Port _stat module to multiphase
 initialization

---
 ...2020-04-30-01-44-42.bpo-1635741.GKtjqr.rst |   1 +
 Modules/_stat.c                               | 348 +++++++++++++-----
 2 files changed, 249 insertions(+), 100 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Core and Builtins/2020-04-30-01-44-42.bpo-1635741.GKtjqr.rst

diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-04-30-01-44-42.bpo-1635741.GKtjqr.rst b/Misc/NEWS.d/next/Core and Builtins/2020-04-30-01-44-42.bpo-1635741.GKtjqr.rst
new file mode 100644
index 00000000000000..7b3c7511e139ec
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-04-30-01-44-42.bpo-1635741.GKtjqr.rst	
@@ -0,0 +1 @@
+Port _stat module to multiphase initialization (:pep:`489`).
diff --git a/Modules/_stat.c b/Modules/_stat.c
index 6a3020a00d1142..e7d722963e8881 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -492,113 +492,261 @@ ST_CTIME\n\
 ");
 
 
+static int
+stat_exec(PyObject *module)
+{
+    if (PyModule_AddIntMacro(module, S_IFDIR) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFCHR) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFBLK) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFREG) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFIFO) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFLNK) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFSOCK) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFDOOR) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFPORT) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IFWHT) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntMacro(module, S_ISUID) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_ISGID) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_ISVTX) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_ENFMT) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntMacro(module, S_IREAD) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IWRITE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IEXEC) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntMacro(module, S_IRWXU) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IRUSR) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IWUSR) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IXUSR) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntMacro(module, S_IRWXG) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IRGRP) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IWGRP) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IXGRP) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntMacro(module, S_IRWXO) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IROTH) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IWOTH) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, S_IXOTH) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntMacro(module, UF_NODUMP) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, UF_IMMUTABLE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, UF_APPEND) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, UF_OPAQUE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, UF_NOUNLINK) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, UF_COMPRESSED) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, UF_HIDDEN) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, SF_ARCHIVED) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, SF_IMMUTABLE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, SF_APPEND) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, SF_NOUNLINK) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, SF_SNAPSHOT) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddIntConstant(module, "ST_MODE", 0) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_INO", 1) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_DEV", 2) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_NLINK", 3) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_UID", 4) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_GID", 5) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_SIZE", 6) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_ATIME", 7) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_MTIME", 8) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntConstant(module, "ST_CTIME", 9) < 0) {
+        return -1;
+    }
+
+#ifdef MS_WINDOWS
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_ARCHIVE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_COMPRESSED) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_DEVICE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_DIRECTORY) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_ENCRYPTED) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_HIDDEN) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_INTEGRITY_STREAM) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_NORMAL) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_NO_SCRUB_DATA) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_OFFLINE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_READONLY) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_REPARSE_POINT) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_SPARSE_FILE) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_SYSTEM) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_TEMPORARY) < 0) {
+        return -1;
+    }
+    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_VIRTUAL) < 0) {
+        return -1;
+    }
+
+    if (PyModule_AddObject(module, "IO_REPARSE_TAG_SYMLINK",
+        PyLong_FromUnsignedLong(IO_REPARSE_TAG_SYMLINK)) < 0) {
+            return -1;
+    }
+    if (PyModule_AddObject(module, "IO_REPARSE_TAG_MOUNT_POINT",
+        PyLong_FromUnsignedLong(IO_REPARSE_TAG_MOUNT_POINT)) < 0) {
+            return -1;
+    }
+    if (PyModule_AddObject(module, "IO_REPARSE_TAG_APPEXECLINK",
+        PyLong_FromUnsignedLong(IO_REPARSE_TAG_APPEXECLINK)) < 0) {
+            return -1;
+    }
+#endif
+
+    return 0;
+}
+
+
+static PyModuleDef_Slot stat_slots[] = {
+    {Py_mod_exec, stat_exec},
+    {0, NULL}
+};
+
+
 static struct PyModuleDef statmodule = {
     PyModuleDef_HEAD_INIT,
-    "_stat",
-    module_doc,
-    -1,
-    stat_methods,
-    NULL,
-    NULL,
-    NULL,
-    NULL
+    .m_name = "_stat",
+    .m_doc = module_doc,
+    .m_size = 0,
+    .m_methods = stat_methods,
+    .m_slots = stat_slots,
 };
 
+
 PyMODINIT_FUNC
 PyInit__stat(void)
 {
-    PyObject *m;
-    m = PyModule_Create(&statmodule);
-    if (m == NULL)
-        return NULL;
-
-    if (PyModule_AddIntMacro(m, S_IFDIR)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFCHR)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFBLK)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFREG)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFIFO)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFLNK)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFSOCK)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFDOOR)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFPORT)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IFWHT)) return NULL;
-
-    if (PyModule_AddIntMacro(m, S_ISUID)) return NULL;
-    if (PyModule_AddIntMacro(m, S_ISGID)) return NULL;
-    if (PyModule_AddIntMacro(m, S_ISVTX)) return NULL;
-    if (PyModule_AddIntMacro(m, S_ENFMT)) return NULL;
-
-    if (PyModule_AddIntMacro(m, S_IREAD)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IWRITE)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IEXEC)) return NULL;
-
-    if (PyModule_AddIntMacro(m, S_IRWXU)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IRUSR)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IWUSR)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IXUSR)) return NULL;
-
-    if (PyModule_AddIntMacro(m, S_IRWXG)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IRGRP)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IWGRP)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IXGRP)) return NULL;
-
-    if (PyModule_AddIntMacro(m, S_IRWXO)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IROTH)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IWOTH)) return NULL;
-    if (PyModule_AddIntMacro(m, S_IXOTH)) return NULL;
-
-    if (PyModule_AddIntMacro(m, UF_NODUMP)) return NULL;
-    if (PyModule_AddIntMacro(m, UF_IMMUTABLE)) return NULL;
-    if (PyModule_AddIntMacro(m, UF_APPEND)) return NULL;
-    if (PyModule_AddIntMacro(m, UF_OPAQUE)) return NULL;
-    if (PyModule_AddIntMacro(m, UF_NOUNLINK)) return NULL;
-    if (PyModule_AddIntMacro(m, UF_COMPRESSED)) return NULL;
-    if (PyModule_AddIntMacro(m, UF_HIDDEN)) return NULL;
-    if (PyModule_AddIntMacro(m, SF_ARCHIVED)) return NULL;
-    if (PyModule_AddIntMacro(m, SF_IMMUTABLE)) return NULL;
-    if (PyModule_AddIntMacro(m, SF_APPEND)) return NULL;
-    if (PyModule_AddIntMacro(m, SF_NOUNLINK)) return NULL;
-    if (PyModule_AddIntMacro(m, SF_SNAPSHOT)) return NULL;
-
-    if (PyModule_AddIntConstant(m, "ST_MODE", 0)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_INO", 1)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_DEV", 2)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_NLINK", 3)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_UID", 4)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_GID", 5)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_SIZE", 6)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_ATIME", 7)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_MTIME", 8)) return NULL;
-    if (PyModule_AddIntConstant(m, "ST_CTIME", 9)) return NULL;
-
-#ifdef MS_WINDOWS
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_ARCHIVE)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_COMPRESSED)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_DEVICE)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_DIRECTORY)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_ENCRYPTED)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_HIDDEN)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_INTEGRITY_STREAM)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_NORMAL)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_NO_SCRUB_DATA)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_OFFLINE)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_READONLY)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_REPARSE_POINT)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_SPARSE_FILE)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_SYSTEM)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_TEMPORARY)) return NULL;
-    if (PyModule_AddIntMacro(m, FILE_ATTRIBUTE_VIRTUAL)) return NULL;
-
-    if (PyModule_AddObject(m, "IO_REPARSE_TAG_SYMLINK",
-        PyLong_FromUnsignedLong(IO_REPARSE_TAG_SYMLINK))) return NULL;
-    if (PyModule_AddObject(m, "IO_REPARSE_TAG_MOUNT_POINT",
-        PyLong_FromUnsignedLong(IO_REPARSE_TAG_MOUNT_POINT))) return NULL;
-    if (PyModule_AddObject(m, "IO_REPARSE_TAG_APPEXECLINK",
-        PyLong_FromUnsignedLong(IO_REPARSE_TAG_APPEXECLINK))) return NULL;
-#endif
-
-    return m;
+    return PyModuleDef_Init(&statmodule);
 }
 
 #ifdef __cplusplus

From bd8dac71464be0be19edd3a9930f802fae04afe5 Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 30 Apr 2020 02:22:33 +0900
Subject: [PATCH 2/5] bpo-1635741: Apply code review

---
 Modules/_stat.c | 299 ++++++++++++++----------------------------------
 1 file changed, 89 insertions(+), 210 deletions(-)

diff --git a/Modules/_stat.c b/Modules/_stat.c
index e7d722963e8881..a3bbb9248f264e 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -495,219 +495,98 @@ ST_CTIME\n\
 static int
 stat_exec(PyObject *module)
 {
-    if (PyModule_AddIntMacro(module, S_IFDIR) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFCHR) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFBLK) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFREG) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFIFO) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFLNK) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFSOCK) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFDOOR) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFPORT) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IFWHT) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntMacro(module, S_ISUID) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_ISGID) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_ISVTX) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_ENFMT) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntMacro(module, S_IREAD) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IWRITE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IEXEC) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntMacro(module, S_IRWXU) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IRUSR) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IWUSR) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IXUSR) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntMacro(module, S_IRWXG) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IRGRP) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IWGRP) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IXGRP) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntMacro(module, S_IRWXO) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IROTH) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IWOTH) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, S_IXOTH) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntMacro(module, UF_NODUMP) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, UF_IMMUTABLE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, UF_APPEND) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, UF_OPAQUE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, UF_NOUNLINK) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, UF_COMPRESSED) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, UF_HIDDEN) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, SF_ARCHIVED) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, SF_IMMUTABLE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, SF_APPEND) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, SF_NOUNLINK) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, SF_SNAPSHOT) < 0) {
-        return -1;
-    }
-
-    if (PyModule_AddIntConstant(module, "ST_MODE", 0) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_INO", 1) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_DEV", 2) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_NLINK", 3) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_UID", 4) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_GID", 5) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_SIZE", 6) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_ATIME", 7) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_MTIME", 8) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntConstant(module, "ST_CTIME", 9) < 0) {
-        return -1;
+#define ADD_INT_MACRO(module, macro)                                  \
+    do {                                                              \
+        if (PyModule_AddIntMacro(module, macro) < 0) {                \
+            return -1;                                                \
+        }                                                             \
+    } while (0)
+
+    ADD_INT_MACRO(module, S_IFDIR);
+    ADD_INT_MACRO(module, S_IFCHR);
+    ADD_INT_MACRO(module, S_IFBLK);
+    ADD_INT_MACRO(module, S_IFREG);
+    ADD_INT_MACRO(module, S_IFIFO);
+    ADD_INT_MACRO(module, S_IFLNK);
+    ADD_INT_MACRO(module, S_IFSOCK);
+    ADD_INT_MACRO(module, S_IFDOOR);
+    ADD_INT_MACRO(module, S_IFPORT);
+    ADD_INT_MACRO(module, S_IFWHT);
+
+    ADD_INT_MACRO(module, S_ISUID);
+    ADD_INT_MACRO(module, S_ISGID);
+    ADD_INT_MACRO(module, S_ISVTX);
+    ADD_INT_MACRO(module, S_ENFMT);
+
+    ADD_INT_MACRO(module, S_IREAD);
+    ADD_INT_MACRO(module, S_IWRITE);
+    ADD_INT_MACRO(module, S_IEXEC);
+
+    ADD_INT_MACRO(module, S_IRWXU);
+    ADD_INT_MACRO(module, S_IRUSR);
+    ADD_INT_MACRO(module, S_IWUSR);
+    ADD_INT_MACRO(module, S_IXUSR);
+
+    ADD_INT_MACRO(module, S_IRWXG);
+    ADD_INT_MACRO(module, S_IRGRP);
+    ADD_INT_MACRO(module, S_IWGRP);
+    ADD_INT_MACRO(module, S_IXGRP);
+
+    ADD_INT_MACRO(module, S_IRWXO);
+    ADD_INT_MACRO(module, S_IROTH);
+    ADD_INT_MACRO(module, S_IWOTH);
+    ADD_INT_MACRO(module, S_IXOTH);
+
+    ADD_INT_MACRO(module, UF_NODUMP);
+    ADD_INT_MACRO(module, UF_IMMUTABLE);
+    ADD_INT_MACRO(module, UF_APPEND);
+    ADD_INT_MACRO(module, UF_OPAQUE);
+    ADD_INT_MACRO(module, UF_NOUNLINK);
+    ADD_INT_MACRO(module, UF_COMPRESSED);
+    ADD_INT_MACRO(module, UF_HIDDEN);
+    ADD_INT_MACRO(module, SF_ARCHIVED);
+    ADD_INT_MACRO(module, SF_IMMUTABLE);
+    ADD_INT_MACRO(module, SF_APPEND);
+    ADD_INT_MACRO(module, SF_NOUNLINK);
+    ADD_INT_MACRO(module, SF_SNAPSHOT);
+
+    const char* st_constants[] = {
+        "ST_MODE",
+        "ST_INO",
+        "ST_DEV",
+        "ST_NLINK",
+        "ST_UID",
+        "ST_GID",
+        "ST_SIZE",
+        "ST_ATIME",
+        "ST_MTIME",
+        "ST_CTIME"
+    };
+
+    for (size_t i = 0; i < Py_ARRAY_LENGTH(st_constants); i++) {
+        if (PyModule_AddIntConstant(module, st_constants[i], i) < 0) {
+            return -1;
+        }
     }
 
 #ifdef MS_WINDOWS
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_ARCHIVE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_COMPRESSED) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_DEVICE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_DIRECTORY) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_ENCRYPTED) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_HIDDEN) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_INTEGRITY_STREAM) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_NORMAL) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_NO_SCRUB_DATA) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_OFFLINE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_READONLY) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_REPARSE_POINT) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_SPARSE_FILE) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_SYSTEM) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_TEMPORARY) < 0) {
-        return -1;
-    }
-    if (PyModule_AddIntMacro(module, FILE_ATTRIBUTE_VIRTUAL) < 0) {
-        return -1;
-    }
+    ADD_INT_MACROmodule, FILE_ATTRIBUTE_ARCHIVE);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_COMPRESSED);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_DEVICE);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_DIRECTORY);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_ENCRYPTED);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_HIDDEN);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_INTEGRITY_STREAM);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_NORMAL);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_NO_SCRUB_DATA);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_OFFLINE);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_READONLY);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_REPARSE_POINT);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_SPARSE_FILE);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_SYSTEM);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_TEMPORARY);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_VIRTUAL);
 
     if (PyModule_AddObject(module, "IO_REPARSE_TAG_SYMLINK",
         PyLong_FromUnsignedLong(IO_REPARSE_TAG_SYMLINK)) < 0) {

From cb75a3ae3a3ad6d4c4f40d90a1eae2d5ae3884ed Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 30 Apr 2020 02:30:51 +0900
Subject: [PATCH 3/5] bpo-1635741: Fix

---
 Modules/_stat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/_stat.c b/Modules/_stat.c
index a3bbb9248f264e..dbe73b7a58ec12 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -570,7 +570,7 @@ stat_exec(PyObject *module)
     }
 
 #ifdef MS_WINDOWS
-    ADD_INT_MACROmodule, FILE_ATTRIBUTE_ARCHIVE);
+    ADD_INT_MACRO(module, FILE_ATTRIBUTE_ARCHIVE);
     ADD_INT_MACRO(module, FILE_ATTRIBUTE_COMPRESSED);
     ADD_INT_MACRO(module, FILE_ATTRIBUTE_DEVICE);
     ADD_INT_MACRO(module, FILE_ATTRIBUTE_DIRECTORY);

From 41fdd0f203b38ec7c95c67626994ac85f56b66ec Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 30 Apr 2020 02:43:49 +0900
Subject: [PATCH 4/5] bpo-1635741: Update

---
 Modules/_stat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/_stat.c b/Modules/_stat.c
index dbe73b7a58ec12..3ba4f777d8b650 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -497,7 +497,7 @@ stat_exec(PyObject *module)
 {
 #define ADD_INT_MACRO(module, macro)                                  \
     do {                                                              \
-        if (PyModule_AddIntMacro(module, macro) < 0) {                \
+        if (PyModule_AddIntConstant(module, #macro, macro) < 0) {     \
             return -1;                                                \
         }                                                             \
     } while (0)

From bf0be2bd67090982bbb094428936d60b2f353c3d Mon Sep 17 00:00:00 2001
From: Dong-hee Na <donghee.na92@gmail.com>
Date: Thu, 30 Apr 2020 02:53:36 +0900
Subject: [PATCH 5/5] bpo-1635741: Apply Victor's suggestion

---
 Modules/_stat.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/_stat.c b/Modules/_stat.c
index 3ba4f777d8b650..45a4e080c77461 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -563,7 +563,7 @@ stat_exec(PyObject *module)
         "ST_CTIME"
     };
 
-    for (size_t i = 0; i < Py_ARRAY_LENGTH(st_constants); i++) {
+    for (int i = 0; i < Py_ARRAY_LENGTH(st_constants); i++) {
         if (PyModule_AddIntConstant(module, st_constants[i], i) < 0) {
             return -1;
         }
@@ -589,15 +589,15 @@ stat_exec(PyObject *module)
     ADD_INT_MACRO(module, FILE_ATTRIBUTE_VIRTUAL);
 
     if (PyModule_AddObject(module, "IO_REPARSE_TAG_SYMLINK",
-        PyLong_FromUnsignedLong(IO_REPARSE_TAG_SYMLINK)) < 0) {
+                           PyLong_FromUnsignedLong(IO_REPARSE_TAG_SYMLINK)) < 0) {
             return -1;
     }
     if (PyModule_AddObject(module, "IO_REPARSE_TAG_MOUNT_POINT",
-        PyLong_FromUnsignedLong(IO_REPARSE_TAG_MOUNT_POINT)) < 0) {
+                           PyLong_FromUnsignedLong(IO_REPARSE_TAG_MOUNT_POINT)) < 0) {
             return -1;
     }
     if (PyModule_AddObject(module, "IO_REPARSE_TAG_APPEXECLINK",
-        PyLong_FromUnsignedLong(IO_REPARSE_TAG_APPEXECLINK)) < 0) {
+                           PyLong_FromUnsignedLong(IO_REPARSE_TAG_APPEXECLINK)) < 0) {
             return -1;
     }
 #endif