[Python-checkins] bpo-43916: Export the _PyStructSequence_InitType to fix build errors in the curses module (GH-25768)

pablogsal webhook-mailer at python.org
Fri Apr 30 21:21:27 EDT 2021


https://github.com/python/cpython/commit/558df9010915c8fe94f4d7f842e7c5aabbb06b14
commit: 558df9010915c8fe94f4d7f842e7c5aabbb06b14
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: pablogsal <Pablogsal at gmail.com>
date: 2021-05-01T02:21:19+01:00
summary:

bpo-43916: Export the _PyStructSequence_InitType to fix build errors in the curses module (GH-25768)

files:
M Doc/data/stable_abi.dat
M Include/structseq.h
M Misc/stable_abi.txt
M PC/python3dll.c

diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
index 833228f7fd755d..b21374a05cb6a5 100644
--- a/Doc/data/stable_abi.dat
+++ b/Doc/data/stable_abi.dat
@@ -918,6 +918,7 @@ Py_tp_setattro
 Py_tp_str
 Py_tp_traverse
 Py_uintptr_t
+_PyStructSequence_InitType
 _frame
 _node
 allocfunc
diff --git a/Include/structseq.h b/Include/structseq.h
index af3af415b013a7..890e03130b4edb 100644
--- a/Include/structseq.h
+++ b/Include/structseq.h
@@ -27,12 +27,10 @@ PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type,
 PyAPI_FUNC(int) PyStructSequence_InitType2(PyTypeObject *type,
                                            PyStructSequence_Desc *desc);
 #endif
-#ifdef Py_BUILD_CORE
-extern int _PyStructSequence_InitType(
+PyAPI_FUNC(int) _PyStructSequence_InitType(
     PyTypeObject *type,
     PyStructSequence_Desc *desc,
     unsigned long tp_flags);
-#endif
 PyAPI_FUNC(PyTypeObject*) PyStructSequence_NewType(PyStructSequence_Desc *desc);
 
 PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type);
diff --git a/Misc/stable_abi.txt b/Misc/stable_abi.txt
index 2a802bd5f4b831..d79746e0a4ec04 100644
--- a/Misc/stable_abi.txt
+++ b/Misc/stable_abi.txt
@@ -2121,6 +2121,8 @@ function PyObject_GetAiter
     added 3.10
 data PyExc_EncodingWarning
     added 3.10
+function _PyStructSequence_InitType
+    added 3.10
 
 # Support for Stable ABI in debug builds
 
diff --git a/PC/python3dll.c b/PC/python3dll.c
index 574d4dcad9f75b..30868c1864622e 100755
--- a/PC/python3dll.c
+++ b/PC/python3dll.c
@@ -35,6 +35,7 @@ EXPORT_FUNC(_PyObject_GC_Resize)
 EXPORT_FUNC(_PyObject_New)
 EXPORT_FUNC(_PyObject_NewVar)
 EXPORT_FUNC(_PyState_AddModule)
+EXPORT_FUNC(_PyStructSequence_InitType)
 EXPORT_FUNC(_PyThreadState_Init)
 EXPORT_FUNC(_PyThreadState_Prealloc)
 EXPORT_FUNC(_PyTrash_deposit_object)



More information about the Python-checkins mailing list