diff options
| author | Christian Tismer <tismer@stackless.com> | 2020-11-18 18:25:07 +0100 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2020-11-30 23:48:23 +0000 |
| commit | fca3aada26d4ec3f9431d2983bf7135ecb0cb547 (patch) | |
| tree | 22e2b4b88dfc25c7154f19be598e7a2c6c66344c /sources/shiboken2/libshiboken/basewrapper.h | |
| parent | 3d137f78105fe71bffeabfd6dd763b5502c58cf5 (diff) | |
cppgenerator: rework keyword handling regarding unknown keywords
PySide has a distinction between functions with simple arguments and
functions with keyword arguments for optional keywords.
When a function has keywords specified in one or more signature
branch, it gets the METH_KEYWORDS flag. In this case, it is checked
that no argument is given positional and per keyword at the same time.
Completely forgotten was to check which keywords are allowed in that
branch, if at all. The problem was much complicated because
constructors can contain extra signals and properties.
At the same time, all further error messages are generated with Python.
This adds necessary flexibility when features are active.
All PyBuildValue objects were refcount leaking. That has been replaced
by static createStaticString expressions.
The `argNames` structure is no longer needed by the improved algorithm.
Change-Id: Ic297912c47231720f61c7d4b79b46a1e376a9941
Fixes: PYSIDE-1305
Task-number: PYSIDE-1019
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit b6e57864e5f4d470196f7425c631981de6d1aeb4)
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken2/libshiboken/basewrapper.h')
| -rw-r--r-- | sources/shiboken2/libshiboken/basewrapper.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sources/shiboken2/libshiboken/basewrapper.h b/sources/shiboken2/libshiboken/basewrapper.h index 31083522b..204c4c1c3 100644 --- a/sources/shiboken2/libshiboken/basewrapper.h +++ b/sources/shiboken2/libshiboken/basewrapper.h @@ -157,8 +157,10 @@ void callCppDestructor(void *cptr) delete reinterpret_cast<T *>(cptr); } -// setErrorAboutWrongArguments now gets overload info from the signature module. -LIBSHIBOKEN_API void setErrorAboutWrongArguments(PyObject *args, const char *funcName); +// setErrorAboutWrongArguments now gets overload information from the signature module. +// The extra info argument can contain additional data about the error. +LIBSHIBOKEN_API void setErrorAboutWrongArguments(PyObject *args, const char *funcName, + PyObject *info); namespace ObjectType { |