Move _PyType_DisabledNew to Include/internal and build affected extension modules with Py_BUILD_CORE_*

Author: Erlend E. Aasland

Include/cpython/object.h

@@ -4,9 +4,6 @@
 
 PyAPI_FUNC(void) _Py_NewReference(PyObject *op);
 
-PyAPI_FUNC(PyObject *) _PyType_DisabledNew(PyTypeObject *, PyObject *,
-                                           PyObject *);
-
 #ifdef Py_TRACE_REFS
 /* Py_TRACE_REFS is such major surgery that we call external routines. */
 PyAPI_FUNC(void) _Py_ForgetReference(PyObject *);

Include/internal/pycore_object.h

@@ -29,6 +29,9 @@ _PyType_HasFeature(PyTypeObject *type, unsigned long feature) {
 
 extern void _PyType_InitCache(PyInterpreterState *interp);
 
+PyAPI_FUNC(PyObject *) _PyType_DisabledNew(PyTypeObject *type, PyObject *args,
+                                           PyObject *kwds);
+
 
 /* Inline functions trading binary compatibility for speed:
    _PyObject_Init() is the fast version of PyObject_Init(), and

Modules/Setup

@@ -166,7 +166,7 @@ _symtable symtablemodule.c
 
 # Modules that should always be present (non UNIX dependent):
 
-#array -DPy_BUILD_CORE_MODULE arraymodule.c	# array objects
+#array -DPy_BUILD_CORE_BUILTIN arraymodule.c	# array objects
 #cmath cmathmodule.c _math.c -DPy_BUILD_CORE_MODULE # -lm # complex math library functions
 #math mathmodule.c _math.c -DPy_BUILD_CORE_MODULE # -lm # math library functions, e.g. sin()
 #_contextvars _contextvarsmodule.c  # Context Variables
@@ -279,7 +279,7 @@ _symtable symtablemodule.c
 # every system.
 
 # *** Always uncomment this (leave the leading underscore in!):
-# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -DPy_BUILD_CORE_BUILTIN \
 # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
 #	-L/usr/local/lib \
 # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
@@ -320,7 +320,7 @@ _symtable symtablemodule.c
 
 #_curses _cursesmodule.c -lcurses -ltermcap -DPy_BUILD_CORE_MODULE
 # Wrapper for the panel library that's part of ncurses and SYSV curses.
-#_curses_panel _curses_panel.c -lpanel -lncurses
+#_curses_panel _curses_panel.c -lpanel -lncurses -DPy_BUILD_CORE_BUILTIN
 
 
 # Modules that provide persistent dictionary-like semantics.  You will
@@ -330,11 +330,11 @@ _symtable symtablemodule.c
 # implementation independent wrapper for these; dbm/dumb.py provides
 # similar functionality (but slower of course) implemented in Python.
 
-#_dbm _dbmmodule.c 	# dbm(3) may require -lndbm or similar
+#_dbm _dbmmodule.c -DPy_BUILD_CORE_BUILTIN	# dbm(3) may require -lndbm or similar
 
 # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
 
-#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
+#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm -DPy_BUILD_CORE_BUILTIN
 
 
 # Helper module for various ascii-encoders
@@ -343,17 +343,17 @@ _symtable symtablemodule.c
 # Andrew Kuchling's zlib module.
 # This require zlib 1.1.3 (or later).
 # See http://www.gzip.org/zlib/
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -DPy_BUILD_CORE_BUILTIN
 
 # Interface to the Expat XML parser
 # More information on Expat can be found at www.libexpat.org.
 #
-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI
+#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI -DPy_BUILD_CORE_BUILTIN
 
 # Hye-Shik Chang's CJKCodecs
 
 # multibytecodec is required for all the other CJK codec modules
-#_multibytecodec cjkcodecs/multibytecodec.c
+#_multibytecodec cjkcodecs/multibytecodec.c -DPy_BUILD_CORE_BUILTIN
 
 #_codecs_cn cjkcodecs/_codecs_cn.c
 #_codecs_hk cjkcodecs/_codecs_hk.c

Modules/_curses_panel.c

@@ -13,6 +13,7 @@ static const char PyCursesVersion[] = "2.1";
 #include "Python.h"
 
 #include "py_curses.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 
 #include <panel.h>
 

Modules/_dbmmodule.c

@@ -4,6 +4,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 
 #include <sys/types.h>
 #include <sys/stat.h>

Modules/_gdbmmodule.c

@@ -5,6 +5,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 
 #include <sys/types.h>
 #include <sys/stat.h>

Modules/_sre.c

@@ -43,6 +43,7 @@ static const char copyright[] =
 #include "Python.h"
 #include "pycore_long.h"          // _PyLong_GetZero()
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "structmember.h"         // PyMemberDef
 
 #include "sre.h"

Modules/_threadmodule.c

@@ -5,6 +5,7 @@
 #include "Python.h"
 #include "pycore_interp.h"        // _PyInterpreterState.num_threads
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "pycore_pylifecycle.h"
 #include "pycore_pystate.h"       // _PyThreadState_Init()
 #include <stddef.h>               // offsetof()

Modules/_tkinter.c

@@ -24,6 +24,7 @@ Copyright (C) 1994 Steen Lumholt.
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include <ctype.h>
 
 #ifdef MS_WINDOWS

Modules/arraymodule.c

@@ -6,6 +6,7 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "structmember.h"         // PyMemberDef
 #include <stddef.h>               // offsetof()
 

Modules/cjkcodecs/multibytecodec.c

@@ -6,6 +6,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "structmember.h"         // PyMemberDef
 #include "multibytecodec.h"
 #include "clinic/multibytecodec.c.h"

Modules/posixmodule.c

@@ -29,6 +29,7 @@
 #include "pycore_ceval.h"         // _PyEval_ReInitThreads()
 #include "pycore_import.h"        // _PyImport_ReInitLock()
 #include "pycore_initconfig.h"    // _PyStatus_EXCEPTION()
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #include "structmember.h"         // PyMemberDef
 #ifndef MS_WINDOWS

Modules/pyexpat.c

@@ -1,6 +1,7 @@
 #include "Python.h"
 #include <ctype.h>
 
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "structmember.h"         // PyMemberDef
 #include "frameobject.h"
 #include "expat.h"

Modules/unicodedata.c

@@ -16,6 +16,7 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "pycore_ucnhash.h"       // _PyUnicode_Name_CAPI
 #include "structmember.h"         // PyMemberDef
 

Modules/zlibmodule.c

@@ -6,6 +6,7 @@
 #define PY_SSIZE_T_CLEAN
 
 #include "Python.h"
+#include "pycore_object.h"        // _PyType_DisabledNew()
 #include "structmember.h"         // PyMemberDef
 #include "zlib.h"
 

setup.py

@@ -1190,6 +1190,7 @@ def detect_readline_curses(self):
             self.add(Extension('_curses_panel', ['_curses_panel.c'],
                            include_dirs=curses_includes,
                            define_macros=curses_defines,
+                           extra_compile_args=['-DPy_BUILD_CORE_MODULE'],
                            libraries=[panel_library, *curses_libs]))
         elif not skip_curses_panel:
             self.missing.append('_curses_panel')
@@ -1440,6 +1441,7 @@ class db_found(Exception): pass
             else:
                 dbm_order = "ndbm:gdbm:bdb".split(":")
             dbmext = None
+            dbm_compile_args = ['-DPy_BUILD_CORE_MODULE']
             for cand in dbm_order:
                 if cand == "ndbm":
                     if find_file("ndbm.h", self.inc_dirs, []) is not None:
@@ -1458,6 +1460,7 @@ class db_found(Exception): pass
                                            define_macros=[
                                                ('HAVE_NDBM_H',None),
                                                ],
+                                           extra_compile_args=dbm_compile_args,
                                            libraries=ndbm_libs)
                         break
 
@@ -1474,6 +1477,7 @@ class db_found(Exception): pass
                                 define_macros=[
                                     ('HAVE_GDBM_NDBM_H', None),
                                     ],
+                                extra_compile_args=dbm_compile_args,
                                 libraries = gdbm_libs)
                             break
                         if find_file("gdbm-ndbm.h", self.inc_dirs, []) is not None:
@@ -1483,6 +1487,7 @@ class db_found(Exception): pass
                                 define_macros=[
                                     ('HAVE_GDBM_DASH_NDBM_H', None),
                                     ],
+                                extra_compile_args=dbm_compile_args,
                                 libraries = gdbm_libs)
                             break
                 elif cand == "bdb":
@@ -1496,6 +1501,7 @@ class db_found(Exception): pass
                                                ('HAVE_BERKDB_H', None),
                                                ('DB_DBM_HSEARCH', None),
                                                ],
+                                           extra_compile_args=dbm_compile_args,
                                            libraries=dblibs)
                         break
             if dbmext is not None:
@@ -1507,6 +1513,7 @@ class db_found(Exception): pass
         if ('gdbm' in dbm_order and
             self.compiler.find_library_file(self.lib_dirs, 'gdbm')):
             self.add(Extension('_gdbm', ['_gdbmmodule.c'],
+                               extra_compile_args=dbm_compile_args,
                                libraries=['gdbm']))
         else:
             self.missing.append('_gdbm')
@@ -1682,6 +1689,7 @@ def detect_compress_exts(self):
                         zlib_extra_link_args = ()
                     self.add(Extension('zlib', ['zlibmodule.c'],
                                        libraries=['z'],
+                                       extra_compile_args=['-DPy_BUILD_CORE_MODULE'],
                                        extra_link_args=zlib_extra_link_args))
                     have_zlib = True
                 else:
@@ -1752,7 +1760,7 @@ def detect_expat_elementtree(self):
                 # call XML_SetHashSalt(), expat entropy sources are not needed
                 ('XML_POOR_ENTROPY', '1'),
             ]
-            extra_compile_args = []
+            extra_compile_args = ['-DPy_BUILD_CORE_MODULE']
             expat_lib = []
             expat_sources = ['expat/xmlparse.c',
                              'expat/xmlrole.c',
@@ -1802,7 +1810,8 @@ def detect_expat_elementtree(self):
     def detect_multibytecodecs(self):
         # Hye-Shik Chang's CJKCodecs modules.
         self.add(Extension('_multibytecodec',
-                           ['cjkcodecs/multibytecodec.c']))
+                           ['cjkcodecs/multibytecodec.c'],
+                           extra_compile_args=['-DPy_BUILD_CORE_MODULE']))
         for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
             self.add(Extension('_codecs_%s' % loc,
                                ['cjkcodecs/_codecs_%s.c' % loc]))
@@ -1925,6 +1934,7 @@ def detect_tkinter_fromenv(self):
             return False
 
         extra_compile_args = tcltk_includes.split()
+        extra_compile_args.append('-DPy_BUILD_CORE_MODULE')
         extra_link_args = tcltk_libs.split()
         self.add(Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
                            define_macros=[('WITH_APPINIT', 1)],
@@ -2056,6 +2066,7 @@ def detect_tkinter_darwin(self):
         if '-Wstrict-prototypes' in cflags.split():
             compile_args.append('-Wno-strict-prototypes')
 
+        compile_args.append('-DPy_BUILD_CORE_MODULE')
         self.add(Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
                            define_macros=[('WITH_APPINIT', 1)],
                            include_dirs=include_dirs,