diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-13 12:15:06 +0100 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-19 12:44:30 +0000 |
commit | 3c2ef04c9eade4226f139064c6c45cb4819834e0 (patch) | |
tree | e46d163147df58b8c338d4ee992287978739f7e6 | |
parent | 9fad5661c40497305cdec5a4aa51a8726675cf90 (diff) |
Add std::nullptr_t support
Shiboken did not have support for `nullptr_t` so the
converter was failing when encountering a `nullptr`.
A test case is included.
Fixes: PYSIDE-854
Change-Id: If5aad245e7074ed791bfc7a42a4c6a56de441d5b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | sources/pyside2/tests/QtCore/CMakeLists.txt | 1 | ||||
-rw-r--r-- | sources/pyside2/tests/QtCore/qjsondocument_test.py | 56 | ||||
-rw-r--r-- | sources/shiboken2/libshiboken/sbkconverter.cpp | 4 | ||||
-rw-r--r-- | sources/shiboken2/libshiboken/sbkconverter.h | 3 | ||||
-rw-r--r-- | sources/shiboken2/libshiboken/sbkconverter_p.h | 30 |
5 files changed, 93 insertions, 1 deletions
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt index d6d12f651..08e63d043 100644 --- a/sources/pyside2/tests/QtCore/CMakeLists.txt +++ b/sources/pyside2/tests/QtCore/CMakeLists.txt @@ -68,6 +68,7 @@ PYSIDE_TEST(qfile_test.py) PYSIDE_TEST(qfileread_test.py) PYSIDE_TEST(qflags_test.py) PYSIDE_TEST(qinstallmsghandler_test.py) +PYSIDE_TEST(qjsondocument_test.py) PYSIDE_TEST(qlinef_test.py) PYSIDE_TEST(qlocale_test.py) PYSIDE_TEST(qlockfile_test.py) diff --git a/sources/pyside2/tests/QtCore/qjsondocument_test.py b/sources/pyside2/tests/QtCore/qjsondocument_test.py new file mode 100644 index 000000000..0cd4dc5b2 --- /dev/null +++ b/sources/pyside2/tests/QtCore/qjsondocument_test.py @@ -0,0 +1,56 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of Qt for Python. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Test cases for QJsonDocument/nullptr_t''' + +import unittest +from PySide2.QtCore import QJsonDocument +import py3kcompat as py3k + +class QJsonDocumentTest(unittest.TestCase): + + def testToVariant(self): + a = QJsonDocument.fromJson(b'{"test": null}') + self.assertIsInstance(a, QJsonDocument) + if py3k.IS_PY3K: + self.assertEqual(str(a.toVariant()), "{'test': None}") + else: + self.assertEqual(str(a.toVariant()), "{u'test': None}") + + b = QJsonDocument.fromJson(b'{"test": [null]}') + self.assertIsInstance(b, QJsonDocument) + if py3k.IS_PY3K: + self.assertEqual(str(b.toVariant()), "{'test': [None]}") + else: + self.assertEqual(str(b.toVariant()), "{u'test': [None]}") + + +if __name__ == '__main__': + unittest.main() diff --git a/sources/shiboken2/libshiboken/sbkconverter.cpp b/sources/shiboken2/libshiboken/sbkconverter.cpp index 65844151f..4f6ebf65f 100644 --- a/sources/shiboken2/libshiboken/sbkconverter.cpp +++ b/sources/shiboken2/libshiboken/sbkconverter.cpp @@ -78,7 +78,8 @@ void init() Primitive<unsigned int>::createConverter(), Primitive<unsigned long>::createConverter(), Primitive<unsigned short>::createConverter(), - VoidPtr::createConverter() + VoidPtr::createConverter(), + Primitive<std::nullptr_t>::createConverter() }; PrimitiveTypeConverters = primitiveTypeConverters; @@ -100,6 +101,7 @@ void init() converters["unsigned long"] = primitiveTypeConverters[SBK_UNSIGNEDLONG_IDX]; converters["unsigned short"] = primitiveTypeConverters[SBK_UNSIGNEDSHORT_IDX]; converters["void*"] = primitiveTypeConverters[SBK_VOIDPTR_IDX]; + converters["std::nullptr_t"] = primitiveTypeConverters[SBK_NULLPTR_T_IDX]; initArrayConverters(); } diff --git a/sources/shiboken2/libshiboken/sbkconverter.h b/sources/shiboken2/libshiboken/sbkconverter.h index 0effebf57..33c33025b 100644 --- a/sources/shiboken2/libshiboken/sbkconverter.h +++ b/sources/shiboken2/libshiboken/sbkconverter.h @@ -341,6 +341,7 @@ LIBSHIBOKEN_API bool pythonTypeIsWrapperType(const SbkConverter *converter); #define SBK_UNSIGNEDLONG_IDX 14 #define SBK_UNSIGNEDSHORT_IDX 15 #define SBK_VOIDPTR_IDX 16 +#define SBK_NULLPTR_T_IDX 17 template<typename T> SbkConverter* PrimitiveTypeConverter() { return 0; } template<> inline SbkConverter* PrimitiveTypeConverter<PY_LONG_LONG>() { return primitiveTypeConverter(SBK_PY_LONG_LONG_IDX); } @@ -360,6 +361,7 @@ template<> inline SbkConverter* PrimitiveTypeConverter<unsigned int>() { return template<> inline SbkConverter* PrimitiveTypeConverter<unsigned long>() { return primitiveTypeConverter(SBK_UNSIGNEDLONG_IDX); } template<> inline SbkConverter* PrimitiveTypeConverter<unsigned short>() { return primitiveTypeConverter(SBK_UNSIGNEDSHORT_IDX); } template<> inline SbkConverter* PrimitiveTypeConverter<void*>() { return primitiveTypeConverter(SBK_VOIDPTR_IDX); } +template<> inline SbkConverter* PrimitiveTypeConverter<std::nullptr_t>() { return primitiveTypeConverter(SBK_NULLPTR_T_IDX); } } // namespace Shiboken::Conversions @@ -386,6 +388,7 @@ template<> inline PyTypeObject* SbkType<unsigned char>() { return &PyInt_Type; } template<> inline PyTypeObject* SbkType<unsigned int>() { return &PyLong_Type; } template<> inline PyTypeObject* SbkType<unsigned long>() { return &PyLong_Type; } template<> inline PyTypeObject* SbkType<unsigned short>() { return &PyInt_Type; } +template<> inline PyTypeObject* SbkType<std::nullptr_t>() { return Py_TYPE(&_Py_NoneStruct); } } // namespace Shiboken diff --git a/sources/shiboken2/libshiboken/sbkconverter_p.h b/sources/shiboken2/libshiboken/sbkconverter_p.h index a4edfe81e..cb968ed89 100644 --- a/sources/shiboken2/libshiboken/sbkconverter_p.h +++ b/sources/shiboken2/libshiboken/sbkconverter_p.h @@ -533,6 +533,36 @@ struct Primitive<std::string> : TwoPrimitive<std::string> } }; +// nullptr_t +template <> +struct Primitive<std::nullptr_t> : TwoPrimitive<std::nullptr_t> +{ + static PyObject* toPython(const void* cppIn) + { + return Py_None; + } + static void toCpp(PyObject *, void *cppOut) + { + *reinterpret_cast<std::nullptr_t*>(cppOut) = nullptr; + } + static PythonToCppFunc isConvertible(PyObject* pyIn) + { + if (pyIn == Py_None) + return toCpp; + return nullptr; + } + static void otherToCpp(PyObject* pyIn, void* cppOut) + { + *reinterpret_cast<std::nullptr_t*>(cppOut) = nullptr; + } + static PythonToCppFunc isOtherConvertible(PyObject* pyIn) + { + if (pyIn == nullptr) + return otherToCpp; + return nullptr; + } +}; + namespace Shiboken { namespace Conversions { SbkConverter *createConverterObject(PyTypeObject *type, |