diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-13 14:13:40 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-13 13:56:37 +0000 |
commit | 2f64d1ec7e8a30e6caafe54de03325cde3a80f4d (patch) | |
tree | c546df518ac828dad2f6169e9f937ca44186b412 /libpyside | |
parent | 165326fee678f633dc02b86780d6ccfe5745b623 (diff) |
PySide::MetaFunction::call: Fix error message about number of arguments
Split into branches for too many/too few and subtract return type.
Task-number: PYSIDE-462
Change-Id: I25fbbd4fd18e87c7d9b3cb79b8c2c16e1e816fac
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'libpyside')
-rw-r--r-- | libpyside/pysidemetafunction.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libpyside/pysidemetafunction.cpp b/libpyside/pysidemetafunction.cpp index 543569c8..039db513 100644 --- a/libpyside/pysidemetafunction.cpp +++ b/libpyside/pysidemetafunction.cpp @@ -163,8 +163,17 @@ bool call(QObject* self, int methodIndex, PyObject* args, PyObject** retVal) Shiboken::AutoDecRef sequence(PySequence_Fast(args, 0)); int numArgs = PySequence_Fast_GET_SIZE(sequence.object()) + 1; - if (numArgs - 1 != argTypes.count()) { - PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", method.methodSignature().constData(), argTypes.count(), numArgs); + if (numArgs - 1 > argTypes.count()) { + PyErr_Format(PyExc_TypeError, "%s only accepts %d argument(s), %d given!", + method.methodSignature().constData(), + argTypes.count(), numArgs - 1); + return false; + } + + if (numArgs - 1 < argTypes.count()) { + PyErr_Format(PyExc_TypeError, "%s needs %d argument(s), %d given!", + method.methodSignature().constData(), + argTypes.count(), numArgs - 1); return false; } |