07de0b7c91
This was added in cpython commit [1]
commit 992446dd5bd3fff92ea0f8064fb19eebfe105cef
Author: Mark Shannon <mark@hotpy.org>
Date: Mon Feb 5 16:20:54 2024 +0000
GH-113462: Limit the number of versions that a single class can use. (GH-114900)
, causing an `--enable-werror` build on Debian testing using
system python3-dev 3.13.2-2 to fail like this:
/home/michi/development/git/libreoffice/pyuno/source/module/pyuno_iterator.cxx:185:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
185 | };
| ^
/home/michi/development/git/libreoffice/pyuno/source/module/pyuno_iterator.cxx:334:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
334 | };
| ^
2 errors generated.
make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_iterator.o] Error 1
make[1]: *** Waiting for unfinished jobs....
/home/michi/development/git/libreoffice/pyuno/source/module/pyuno_callable.cxx:252:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
252 | };
| ^
1 error generated.
make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_callable.o] Error 1
/home/michi/development/git/libreoffice/pyuno/source/module/pyuno_struct.cxx:377:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
377 | };
| ^
1 error generated.
make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_struct.o] Error 1
/home/michi/development/git/libreoffice/pyuno/source/module/pyuno.cxx:1693:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
1693 | };
| ^
1 error generated.
make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno.o] Error 1
/home/michi/development/git/libreoffice/pyuno/source/module/pyuno_runtime.cxx:147:1: error: missing field 'tp_versions_used' initializer [-Werror,-Wmissing-field-initializers]
147 | };
| ^
1 error generated.
make[1]: *** [/home/michi/development/git/libreoffice/solenv/gbuild/LinkTarget.mk:336: /home/michi/development/git/libreoffice/workdir/CxxObject/pyuno/source/module/pyuno_runtime.o] Error 1
make: *** [Makefile:128: pyuno] Error 2
Initialize the member to 0, as e.g. commit [2] does for swig.
For cpython versions this is contained in (from within cpython git repo):
$ git tag --contains 992446dd5bd3fff92ea0f8064fb19eebfe105cef
v3.13.0
v3.13.0a4
v3.13.0a5
v3.13.0a6
v3.13.0b1
v3.13.0b2
v3.13.0b3
v3.13.0b4
v3.13.0rc1
v3.13.0rc2
v3.13.0rc3
v3.13.1
v3.13.2
v3.13.3
v3.14.0a1
v3.14.0a2
v3.14.0a3
v3.14.0a4
v3.14.0a5
v3.14.0a6
v3.14.0a7
[1] 992446dd5b
[2] c3e30c5734
Change-Id: I1ad4c511880cf00e4c45b9e835edcd245fe2853c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184198
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
356 lines
8.3 KiB
C++
356 lines
8.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include "pyuno_impl.hxx"
|
|
|
|
#include <com/sun/star/container/XEnumeration.hpp>
|
|
#include <com/sun/star/container/XIndexAccess.hpp>
|
|
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
|
|
#include <com/sun/star/lang/WrappedTargetException.hpp>
|
|
#include <com/sun/star/script/CannotConvertException.hpp>
|
|
|
|
using com::sun::star::container::XEnumeration;
|
|
using com::sun::star::container::XIndexAccess;
|
|
using com::sun::star::lang::IndexOutOfBoundsException;
|
|
using com::sun::star::lang::WrappedTargetException;
|
|
using com::sun::star::uno::Any;
|
|
using com::sun::star::uno::Reference;
|
|
using com::sun::star::uno::RuntimeException;
|
|
|
|
|
|
namespace pyuno
|
|
{
|
|
|
|
static void PyUNO_iterator_del( PyObject* self )
|
|
{
|
|
PyUNO_iterator* me = reinterpret_cast<PyUNO_iterator*>(self);
|
|
|
|
{
|
|
PyThreadDetach antiguard;
|
|
delete me->members;
|
|
}
|
|
PyObject_Del( self );
|
|
}
|
|
|
|
static PyObject* PyUNO_iterator_iter( PyObject *self )
|
|
{
|
|
Py_INCREF( self );
|
|
return self;
|
|
}
|
|
|
|
static PyObject* PyUNO_iterator_next( PyObject *self )
|
|
{
|
|
PyUNO_iterator* me = reinterpret_cast<PyUNO_iterator*>(self);
|
|
|
|
Runtime runtime;
|
|
Any aRet;
|
|
|
|
try
|
|
{
|
|
bool hasMoreElements = false;
|
|
|
|
{
|
|
PyThreadDetach antiguard;
|
|
|
|
hasMoreElements = me->members->xEnumeration->hasMoreElements();
|
|
if ( hasMoreElements )
|
|
{
|
|
aRet = me->members->xEnumeration->nextElement();
|
|
}
|
|
}
|
|
|
|
if ( hasMoreElements )
|
|
{
|
|
PyRef rRet = runtime.any2PyObject( aRet );
|
|
return rRet.getAcquired();
|
|
}
|
|
|
|
PyErr_SetString( PyExc_StopIteration, "" );
|
|
return nullptr;
|
|
}
|
|
catch( css::container::NoSuchElementException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( css::script::CannotConvertException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( css::lang::IllegalArgumentException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( const css::lang::WrappedTargetException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( const css::uno::RuntimeException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
static PyTypeObject PyUNO_iterator_Type =
|
|
{
|
|
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
|
|
"PyUNO_iterator",
|
|
sizeof (PyUNO_iterator),
|
|
0,
|
|
PyUNO_iterator_del,
|
|
#if PY_VERSION_HEX >= 0x03080000
|
|
0, // Py_ssize_t tp_vectorcall_offset
|
|
#else
|
|
nullptr, // printfunc tp_print
|
|
#endif
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
Py_TPFLAGS_HAVE_ITER,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
PyUNO_iterator_iter, // Generic, reused between the iterator types
|
|
PyUNO_iterator_next,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0
|
|
#if PY_VERSION_HEX >= 0x03040000
|
|
, nullptr
|
|
#if PY_VERSION_HEX >= 0x03080000
|
|
, nullptr // vectorcallfunc tp_vectorcall
|
|
#if PY_VERSION_HEX < 0x03090000
|
|
#if defined __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
#endif
|
|
, nullptr // tp_print
|
|
#if defined __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
#endif
|
|
#if PY_VERSION_HEX >= 0x030C00A1
|
|
, 0 // tp_watched
|
|
#endif
|
|
#if PY_VERSION_HEX >= 0x030D00A4
|
|
, 0 // tp_versions_used
|
|
#endif
|
|
#endif
|
|
#endif
|
|
};
|
|
|
|
PyObject* PyUNO_iterator_new( const Reference< XEnumeration >& xEnumeration )
|
|
{
|
|
PyUNO_iterator* self = PyObject_New( PyUNO_iterator, &PyUNO_iterator_Type );
|
|
if ( self == nullptr )
|
|
return nullptr; // == error
|
|
self->members = new PyUNO_iterator_Internals;
|
|
self->members->xEnumeration = xEnumeration;
|
|
return reinterpret_cast<PyObject*>(self);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
static void PyUNO_list_iterator_del( PyObject* self )
|
|
{
|
|
PyUNO_list_iterator* me = reinterpret_cast<PyUNO_list_iterator*>(self);
|
|
|
|
{
|
|
PyThreadDetach antiguard;
|
|
delete me->members;
|
|
}
|
|
PyObject_Del( self );
|
|
}
|
|
|
|
|
|
static PyObject* PyUNO_list_iterator_next( PyObject *self )
|
|
{
|
|
PyUNO_list_iterator* me = reinterpret_cast<PyUNO_list_iterator*>(self);
|
|
|
|
Runtime runtime;
|
|
Any aRet;
|
|
|
|
try
|
|
{
|
|
bool noMoreElements = false;
|
|
{
|
|
PyThreadDetach antiguard;
|
|
try {
|
|
aRet = me->members->xIndexAccess->getByIndex( me->members->index );
|
|
}
|
|
catch( const css::lang::IndexOutOfBoundsException & )
|
|
{
|
|
noMoreElements = true;
|
|
}
|
|
}
|
|
|
|
if ( noMoreElements )
|
|
{
|
|
PyErr_SetString( PyExc_StopIteration, "" );
|
|
return nullptr;
|
|
}
|
|
|
|
PyRef rRet = runtime.any2PyObject( aRet );
|
|
me->members->index++;
|
|
return rRet.getAcquired();
|
|
}
|
|
catch( css::script::CannotConvertException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( css::lang::IllegalArgumentException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( const css::lang::WrappedTargetException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
catch( const css::uno::RuntimeException &e )
|
|
{
|
|
raisePyExceptionWithAny( css::uno::Any( e ) );
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
static PyTypeObject PyUNO_list_iterator_Type =
|
|
{
|
|
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
|
|
"PyUNO_iterator",
|
|
sizeof (PyUNO_list_iterator),
|
|
0,
|
|
PyUNO_list_iterator_del,
|
|
#if PY_VERSION_HEX >= 0x03080000
|
|
0, // Py_ssize_t tp_vectorcall_offset
|
|
#else
|
|
nullptr, // printfunc tp_print
|
|
#endif
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
Py_TPFLAGS_HAVE_ITER,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
PyUNO_iterator_iter, // Generic, reused between the iterator types
|
|
PyUNO_list_iterator_next,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
nullptr,
|
|
0
|
|
#if PY_VERSION_HEX >= 0x03040000
|
|
, nullptr
|
|
#if PY_VERSION_HEX >= 0x03080000
|
|
, nullptr // vectorcallfunc tp_vectorcall
|
|
#if PY_VERSION_HEX < 0x03090000
|
|
#if defined __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
#endif
|
|
, nullptr // tp_print
|
|
#if defined __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
#endif
|
|
#if PY_VERSION_HEX >= 0x030C00A1
|
|
, 0 // tp_watched
|
|
#endif
|
|
#if PY_VERSION_HEX >= 0x030D00A4
|
|
, 0 // tp_versions_used
|
|
#endif
|
|
#endif
|
|
#endif
|
|
};
|
|
|
|
PyObject* PyUNO_list_iterator_new( const Reference<XIndexAccess> &xIndexAccess )
|
|
{
|
|
PyUNO_list_iterator* self = PyObject_New( PyUNO_list_iterator, &PyUNO_list_iterator_Type );
|
|
if ( self == nullptr )
|
|
return nullptr; // == error
|
|
self->members = new PyUNO_list_iterator_Internals;
|
|
self->members->xIndexAccess = xIndexAccess;
|
|
self->members->index = 0;
|
|
return reinterpret_cast<PyObject*>(self);
|
|
}
|
|
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|