Python: [skip ci] tp_print slot has been replaced with tp_vectorcall_offset in Py3.8

This commit is contained in:
wmayer
2020-06-07 12:53:47 +02:00
parent 03113405fc
commit ae641dc527
6 changed files with 49 additions and 2 deletions

View File

@@ -699,7 +699,11 @@ PySwigObject_type(void) {
0, /*tp_itemsize*/
/* methods */
(destructor)PySwigObject_dealloc, /*tp_dealloc*/
#if PY_VERSION_HEX < 0x03080000
(printfunc)PySwigObject_print, /*tp_print*/
#else
0, /*tp_vectorcall_offset*/
#endif
(getattrfunc)0, /*tp_getattr*/
(setattrfunc)0, /*tp_setattr*/
(cmpfunc)PySwigObject_compare, /*tp_compare*/
@@ -859,7 +863,11 @@ PySwigPacked_type(void) {
0, /*tp_itemsize*/
/* methods */
(destructor)PySwigPacked_dealloc, /*tp_dealloc*/
#if PY_VERSION_HEX < 0x03080000
(printfunc)PySwigPacked_print, /*tp_print*/
#else
0, /*tp_vectorcall_offset*/
#endif
(getattrfunc)0, /*tp_getattr*/
(setattrfunc)0, /*tp_setattr*/
(cmpfunc)PySwigPacked_compare, /*tp_compare*/

View File

@@ -1620,7 +1620,11 @@ _PySwigObject_type(void) {
sizeof(PySwigObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)PySwigObject_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)PySwigObject_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)PySwigObject_getattr, /* tp_getattr */
#else
@@ -1790,7 +1794,11 @@ _PySwigPacked_type(void) {
sizeof(PySwigPacked), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)PySwigPacked_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)PySwigPacked_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
(getattrfunc)0, /* tp_getattr */
(setattrfunc)0, /* tp_setattr */
(cmpfunc)PySwigPacked_compare, /* tp_compare */

View File

@@ -1628,7 +1628,12 @@ _PySwigObject_type(void) {
sizeof(PySwigObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)PySwigObject_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)PySwigObject_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)PySwigObject_getattr, /* tp_getattr */
#else
@@ -1798,7 +1803,11 @@ _PySwigPacked_type(void) {
sizeof(PySwigPacked), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)PySwigPacked_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)PySwigPacked_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
(getattrfunc)0, /* tp_getattr */
(setattrfunc)0, /* tp_setattr */
(cmpfunc)PySwigPacked_compare, /* tp_compare */

View File

@@ -1741,7 +1741,11 @@ _PySwigObject_type(void) {
sizeof(SwigPyObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyObject_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)SwigPyObject_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)SwigPyObject_getattr, /* tp_getattr */
#else
@@ -1919,7 +1923,11 @@ _PySwigPacked_type(void) {
sizeof(SwigPyPacked), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyPacked_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)SwigPyPacked_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
(getattrfunc)0, /* tp_getattr */
(setattrfunc)0, /* tp_setattr */
(cmpfunc)SwigPyPacked_compare, /* tp_compare */

View File

@@ -1766,7 +1766,11 @@ _PySwigObject_type(void) {
sizeof(SwigPyObject), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyObject_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)SwigPyObject_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
#if PY_VERSION_HEX < 0x02020000
(getattrfunc)SwigPyObject_getattr, /* tp_getattr */
#else
@@ -1947,8 +1951,12 @@ _PySwigPacked_type(void) {
(char *)"SwigPyPacked", /* tp_name */
sizeof(SwigPyPacked), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)SwigPyPacked_dealloc, /* tp_dealloc */
(printfunc)SwigPyPacked_print, /* tp_print */
(destructor)SwigPyPacked_dealloc, /* tp_dealloc */
#if PY_VERSION_HEX < 0x03080000
(printfunc)SwigPyPacked_print, /* tp_print */
#else
0, /*tp_vectorcall_offset*/
#endif
(getattrfunc)0, /* tp_getattr */
(setattrfunc)0, /* tp_setattr */
#if PY_VERSION_HEX>=0x03000000

View File

@@ -381,7 +381,11 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam
// Methods to implement standard operations
table->tp_dealloc = (destructor)standard_dealloc;
#if PY_VERSION_HEX < 0x03080000
table->tp_print = 0;
#else
table->tp_vectorcall_offset = 0;
#endif
table->tp_getattr = 0;
table->tp_setattr = 0;
table->tp_repr = 0;
@@ -524,7 +528,9 @@ PythonType &PythonType::supportClass()
#ifdef PYCXX_PYTHON_2TO3
PythonType &PythonType::supportPrint()
{
#if PY_VERSION_HEX < 0x03080000
table->tp_print = print_handler;
#endif
return *this;
}
#endif