diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-05-02 15:51:05 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-05-04 14:12:14 +0000 |
| commit | 8ed37563888f7956da99636c62f18459729d5966 (patch) | |
| tree | 96f5acd1a0e3fdb23c6356766f32185f21e79a77 | |
| parent | eda4418502a2c8c2f144ef690684f673ec7ebe24 (diff) | |
Use PyLong instead of PyInt for QVariant
Python 3 uses PyLong for integer manipulation,
and since it is a valid type in Python 2 we can
use it instead to have better compatibility,
and avoid integer overflows.
We keep the PyInt entry to avoid breaking
other sections of the code when this type is required.
Added a couple of PyInt_* alias to use PyLong_* ones
instead.
Task-number: PYSIDE-648
Change-Id: Id6af66050c5ab81fc51c1c07b1c9422a954b81c0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 5 | ||||
| -rw-r--r-- | sources/shiboken2/libshiboken/sbkpython.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 598754fdd..403166d4a 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -394,8 +394,9 @@ double in = %CONVERTTOCPP[double](%in); %out = %OUTTYPE(in); </add-conversion> - <add-conversion type="PyInt"> - int in = %CONVERTTOCPP[int](%in); + <!-- Using PyLong instead of PyInt to support Python2 and 3--> + <add-conversion type="PyInt" check="PyInt_CheckExact(%in)"> + qlonglong in = %CONVERTTOCPP[qlonglong](%in); %out = %OUTTYPE(in); </add-conversion> <add-conversion type="PyLong" check="PyLong_CheckExact(%in)"> diff --git a/sources/shiboken2/libshiboken/sbkpython.h b/sources/shiboken2/libshiboken/sbkpython.h index 57828f624..6d90f4086 100644 --- a/sources/shiboken2/libshiboken/sbkpython.h +++ b/sources/shiboken2/libshiboken/sbkpython.h @@ -48,6 +48,10 @@ #define PyInt_Type PyLong_Type #define PyInt_Check PyLong_Check + #define PyInt_CheckExact PyLong_CheckExact + #define PyInt_FromString PyLong_FromString + #define PyInt_FromSsize_t PyLong_FromSsize_t + #define PyInt_FromSize_t PyLong_FromSize_t #define PyInt_AS_LONG PyLong_AS_LONG #define PyInt_AsUnsignedLongLongMask PyLong_AsLongLong #define PyInt_FromLong PyLong_FromLong |