From 3fd18df188073b95ddb28b5e5f2307fa08b7c2dd Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Fri, 9 Nov 2018 20:04:45 +0100 Subject: Update string treatment for VoidPtr Task-number: PYSIDE-852 Change-Id: If1ff8407c7f9449be278869e91104372fa86790f Reviewed-by: Christian Tismer Reviewed-by: Friedemann Kleint --- sources/shiboken2/libshiboken/voidptr.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sources/shiboken2/libshiboken/voidptr.cpp b/sources/shiboken2/libshiboken/voidptr.cpp index 0d7b6b9cd..a306f7a9d 100644 --- a/sources/shiboken2/libshiboken/voidptr.cpp +++ b/sources/shiboken2/libshiboken/voidptr.cpp @@ -193,7 +193,11 @@ PyObject *SbkVoidPtrObject_repr(PyObject *v) SbkVoidPtrObject *sbkObject = reinterpret_cast(v); + #ifdef IS_PY3K + PyObject *s = PyUnicode_FromFormat("%s(%p, %zd, %s)", + #else PyObject *s = PyBytes_FromFormat("%s(%p, %zd, %s)", + #endif Py_TYPE(sbkObject)->tp_name, sbkObject->cptr, sbkObject->size, @@ -205,7 +209,11 @@ PyObject *SbkVoidPtrObject_repr(PyObject *v) PyObject *SbkVoidPtrObject_str(PyObject *v) { SbkVoidPtrObject *sbkObject = reinterpret_cast(v); + #ifdef IS_PY3K + PyObject *s = PyUnicode_FromFormat("%s(Address %p, Size %zd, isWritable %s)", + #else PyObject *s = PyBytes_FromFormat("%s(Address %p, Size %zd, isWritable %s)", + #endif Py_TYPE(sbkObject)->tp_name, sbkObject->cptr, sbkObject->size, -- cgit v1.2.3