[Python-checkins] bpo-46670: Remove unused macros in the Modules directory (GH-31194)

[vstinner]

https://github.com/python/cpython/commit/4f1d3f33dd8b37a151b73533f18b08b0500223e5
commit: 4f1d3f33dd8b37a151b73533f18b08b0500223e5
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2022-02-07T16:21:31+01:00
summary:

 bpo-46670: Remove unused macros in the Modules directory (GH-31194)

* bpo-46670: Remove unused macros in the Modules directory

* Add again LINKAT_DIR_FD_CONVERTER: generated by Argument Clinic

files:
M Modules/_ctypes/stgdict.c
M Modules/_ssl.c
M Modules/_struct.c
M Modules/_testcapimodule.c
M Modules/_tkinter.c
M Modules/pwdmodule.c

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
index 6c1917b18d450..3470cf114db4f 100644
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -504,7 +504,6 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
     if (stgdict->format == NULL)
         return -1;
 
-#define realdict ((PyObject *)&stgdict->dict)
     for (i = 0; i < len; ++i) {
         PyObject *name = NULL, *desc = NULL;
         PyObject *pair = PySequence_GetItem(fields, i);
@@ -635,7 +634,6 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
         Py_DECREF(pair);
         Py_DECREF(prop);
     }
-#undef realdict
 
     if (isStruct && !isPacked) {
         char *ptr = stgdict->format;
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index b2e241a0a338e..e17876e49a8be 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -40,8 +40,6 @@
 #define PySSL_BEGIN_ALLOW_THREADS { \
             PyThreadState *_save = NULL;  \
             PySSL_BEGIN_ALLOW_THREADS_S(_save);
-#define PySSL_BLOCK_THREADS     PySSL_END_ALLOW_THREADS_S(_save);
-#define PySSL_UNBLOCK_THREADS   PySSL_BEGIN_ALLOW_THREADS_S(_save);
 #define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); }
 
 
diff --git a/Modules/_struct.c b/Modules/_struct.c
index 210dbdc752f4c..7d05ec5ac7c50 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -2065,8 +2065,6 @@ static PyMemberDef s_members[] = {
     {NULL}  /* sentinel */
 };
 
-#define OFF(x) offsetof(PyStructObject, x)
-
 static PyGetSetDef s_getsetlist[] = {
     {"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
     {"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 7369f094faedd..498a7c2fd686b 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -6060,8 +6060,6 @@ static PyMethodDef TestMethods[] = {
     {NULL, NULL} /* sentinel */
 };
 
-#define AddSym(d, n, f, v) {PyObject *o = f(v); PyDict_SetItemString(d, n, o); Py_DECREF(o);}
-
 typedef struct {
     char bool_member;
     char byte_member;
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index f4d2716fe302d..cbef9ce0066db 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -318,10 +318,6 @@ typedef struct {
 
 #define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
 
-#define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
-(void *) v, Py_REFCNT(v)))
-
-
 
 /**** Error Handling ****/
 
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 14d3f9dcb1c60..a757380bd09f7 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -84,7 +84,6 @@ mkpwent(PyObject *module, struct passwd *p)
     if (v == NULL)
         return NULL;
 
-#define SETI(i,val) PyStructSequence_SET_ITEM(v, i, PyLong_FromLong((long) val))
 #define SETS(i,val) sets(v, i, val)
 
     SETS(setIndex++, p->pw_name);
@@ -104,7 +103,6 @@ mkpwent(PyObject *module, struct passwd *p)
     SETS(setIndex++, p->pw_shell);
 
 #undef SETS
-#undef SETI
 
     if (PyErr_Occurred()) {
         Py_XDECREF(v);