gh-104922: remove PY_SSIZE_T_CLEAN (#106315)

methane · web-flow · commit d5bd32fb48ef · 2023-07-02T15:07:46.000+09:00
diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c
@@ -7,7 +7,6 @@ Converted to C by Dmitry Vasiliev (dima at hlabs.spb.ru).
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c
@@ -1,7 +1,5 @@
 /* _bz2 - Low-level Python interface to libbzip2. */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
@@ -30,7 +30,6 @@ Copyright (c) Corporation for National Research Initiatives.
 
    ------------------------------------------------------------------------ */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_codecs.h"        // _PyCodec_Lookup()
 
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -101,7 +101,6 @@ bytes(cdata)
 #ifndef Py_BUILD_CORE_BUILTIN
 #  define Py_BUILD_CORE_MODULE 1
 #endif
-#define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
 // windows.h must be included before pycore internal headers
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
@@ -104,8 +104,6 @@ static const char PyCursesVersion[] = "2.2";
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_structseq.h"     // _PyStructSequence_NewType()
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
@@ -2,7 +2,6 @@
 /* DBM module using dictionary interface */
 
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include <sys/types.h>
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
@@ -11,8 +11,6 @@
  *--------------------------------------------------------------------
  */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 #include "expat.h"
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
@@ -3,7 +3,6 @@
 /* Author: Anthony Baxter, after dbmmodule.c */
 /* Doc strings: Mitch Chapman */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "gdbm.h"
 
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -22,8 +22,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_hashtable.h"
 #include "hashlib.h"
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
@@ -7,7 +7,6 @@
     Mostly written by Amaury Forgeot d'Arc
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "_iomodule.h"
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
@@ -7,7 +7,6 @@
     Written by Amaury Forgeot d'Arc and Antoine Pitrou
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_object.h"
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
@@ -1,6 +1,5 @@
 /* Author: Daniel Stutzbach */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"     // _Py_BEGIN_SUPPRESS_IPH
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c
@@ -8,7 +8,6 @@
 */
 
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_long.h"          // _PyLong_GetOne()
diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include <stddef.h>               // offsetof()
 #include "pycore_object.h"
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -6,7 +6,6 @@
     Written by Amaury Forgeot d'Arc and Antoine Pitrou
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_codecs.h"        // _PyCodecInfo_GetIncrementalDecoder()
diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
@@ -6,7 +6,6 @@
     Written by Steve Dower
 */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"     // _Py_BEGIN_SUPPRESS_IPH
 #include "pycore_object.h"        // _PyObject_GC_UNTRACK()
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
@@ -9,7 +9,6 @@ This software comes with no warranty. Use at your own risk.
 
 ******************************************************************/
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_fileutils.h"
 
diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c
@@ -5,8 +5,6 @@
 
 */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 
diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
@@ -1,8 +1,6 @@
 #ifndef MULTIPROCESSING_H
 #define MULTIPROCESSING_H
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "structmember.h"
 #include "pythread.h"
diff --git a/Modules/_multiprocessing/posixshmem.c b/Modules/_multiprocessing/posixshmem.c
@@ -2,8 +2,6 @@
 posixshmem - A Python extension that provides shm_open() and shm_unlink()
 */
 
-#define PY_SSIZE_T_CLEAN
-
 #include <Python.h>
 
 // for shm_open() and shm_unlink()
diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_CONNECTION_H
 #define PYSQLITE_CONNECTION_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pythread.h"
 #include "structmember.h"
diff --git a/Modules/_sqlite/cursor.h b/Modules/_sqlite/cursor.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_CURSOR_H
 #define PYSQLITE_CURSOR_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include "statement.h"
diff --git a/Modules/_sqlite/microprotocols.h b/Modules/_sqlite/microprotocols.h
@@ -26,7 +26,6 @@
 #ifndef PSYCOPG_MICROPROTOCOLS_H
 #define PSYCOPG_MICROPROTOCOLS_H 1
 
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
 /** exported functions **/
diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_MODULE_H
 #define PYSQLITE_MODULE_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #define LEGACY_TRANSACTION_CONTROL -1
diff --git a/Modules/_sqlite/row.h b/Modules/_sqlite/row.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_ROW_H
 #define PYSQLITE_ROW_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 typedef struct _Row
diff --git a/Modules/_sqlite/statement.h b/Modules/_sqlite/statement.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_STATEMENT_H
 #define PYSQLITE_STATEMENT_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #include "connection.h"
diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h
@@ -23,7 +23,6 @@
 
 #ifndef PYSQLITE_UTIL_H
 #define PYSQLITE_UTIL_H
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pythread.h"
 #include "sqlite3.h"
diff --git a/Modules/_sre/sre.c b/Modules/_sre/sre.c
@@ -38,8 +38,6 @@
 static const char copyright[] =
     " SRE 2.2.2 Copyright (c) 1997-2002 by Secret Labs AB ";
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -25,8 +25,6 @@
 #endif
 #define OPENSSL_NO_DEPRECATED 1
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_weakref.h"       // _PyWeakref_GET_REF()
 
diff --git a/Modules/_stat.c b/Modules/_stat.c
@@ -11,7 +11,6 @@
  *
  */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 
 #ifdef __cplusplus
diff --git a/Modules/_struct.c b/Modules/_struct.c
@@ -7,8 +7,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
 #include "structmember.h"         // PyMemberDef
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
@@ -1,9 +1,6 @@
 /* C Extension module to test all aspects of PEP-3118.
    Written by Stefan Krah. */
 
-
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 
diff --git a/Modules/_testcapi/float.c b/Modules/_testcapi/float.c
@@ -1,5 +1,3 @@
-#define PY_SSIZE_T_CLEAN
-
 #include "parts.h"
 #include "clinic/float.c.h"
 
diff --git a/Modules/_testcapi/getargs.c b/Modules/_testcapi/getargs.c
@@ -3,8 +3,6 @@
  * APIs that parse and build arguments.
  */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "parts.h"
 
 static PyObject *
diff --git a/Modules/_testcapi/structmember.c b/Modules/_testcapi/structmember.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "parts.h"
 #include <stddef.h>   // for offsetof()
 
diff --git a/Modules/_testcapi/unicode.c b/Modules/_testcapi/unicode.c
@@ -1,6 +1,5 @@
 #include <stddef.h>               // ptrdiff_t
 
-#define PY_SSIZE_T_CLEAN
 #include "parts.h"
 
 static struct PyModuleDef *_testcapimodule = NULL;  // set at initialization
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -17,8 +17,6 @@
 /* Always enable assertions */
 #undef NDEBUG
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "frameobject.h"          // PyFrame_New
 #include "marshal.h"              // PyMarshal_WriteLongToFile
diff --git a/Modules/_testclinic.c b/Modules/_testclinic.c
@@ -5,8 +5,6 @@
 /* Always enable assertions */
 #undef NDEBUG
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -9,8 +9,6 @@
 /* Always enable assertions */
 #undef NDEBUG
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "frameobject.h"
 #include "interpreteridobject.h"  // _PyInterpreterID_LookUp()
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -21,7 +21,6 @@ Copyright (C) 1994 Steen Lumholt.
 
 */
 
-#define PY_SSIZE_T_CLEAN
 #ifndef Py_BUILD_CORE_BUILTIN
 #  define Py_BUILD_CORE_MODULE 1
 #endif
diff --git a/Modules/_uuidmodule.c b/Modules/_uuidmodule.c
@@ -3,8 +3,6 @@
  * DCE compatible Universally Unique Identifier library.
  */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #if defined(HAVE_UUID_H)
   // AIX, FreeBSD, libuuid with pkgconf
diff --git a/Modules/_xxtestfuzz/_xxtestfuzz.c b/Modules/_xxtestfuzz/_xxtestfuzz.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <stdlib.h>
 #include <inttypes.h>
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -7,7 +7,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallMethod()
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
diff --git a/Modules/binascii.c b/Modules/binascii.c
@@ -57,8 +57,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_DigitValue
 #include "pycore_strhex.h"        // _Py_strhex_bytes_with_sep()
diff --git a/Modules/cjkcodecs/cjkcodecs.h b/Modules/cjkcodecs/cjkcodecs.h
@@ -7,7 +7,6 @@
 #ifndef _CJKCODECS_H_
 #define _CJKCODECS_H_
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "multibytecodec.h"
 
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
@@ -4,7 +4,6 @@
  * Written by Hye-Shik Chang <perky@FreeBSD.org>
  */
 
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"         // PyMemberDef
 #include "multibytecodec.h"
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
@@ -1,8 +1,5 @@
-
 /* fcntl module */
 
-#define PY_SSIZE_T_CLEAN
-
 #include "Python.h"
 
 #ifdef HAVE_SYS_FILE_H
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
@@ -1,4 +1,3 @@
-#define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_long.h"          // _PyLong_GetZero()
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -22,7 +22,6 @@
 #  define Py_BUILD_CORE_MODULE 1
 #endif
 
-#define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include "pycore_bytesobject.h"   // _PyBytes_Find()
 #include "pycore_fileutils.h"     // _Py_stat_struct
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
diff --git a/Objects/bytes_methods.c b/Objects/bytes_methods.c
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
diff --git a/Objects/fileobject.c b/Objects/fileobject.c
diff --git a/Objects/picklebufobject.c b/Objects/picklebufobject.c
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
diff --git a/PC/winreg.c b/PC/winreg.c
diff --git a/Parser/pegen.h b/Parser/pegen.h
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
diff --git a/Python/marshal.c b/Python/marshal.c

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#define PY_SSIZE_T_CLEAN`
`2`	`1`	`#include "Python.h"`
`3`	`2`	`#include <stddef.h> // offsetof()`
`4`	`3`	`#include "pycore_object.h"`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`
`14`		`-#define PY_SSIZE_T_CLEAN`
`15`	`14`	`#include "Python.h"`
`16`	`15`
`17`	`16`	`#ifdef __cplusplus`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#define PY_SSIZE_T_CLEAN`
`2`		`-`
`3`	`1`	`#include "parts.h"`
`4`	`2`	`#include "clinic/float.c.h"`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#define PY_SSIZE_T_CLEAN`
`2`	`1`	`#include <Python.h>`
`3`	`2`	`#include <stdlib.h>`
`4`	`3`	`#include <inttypes.h>`