diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-09 20:04:45 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-20 13:38:18 +0000 |
| commit | 3fd18df188073b95ddb28b5e5f2307fa08b7c2dd (patch) | |
| tree | 2a255225c6679c3f3422a1031e4e07731a9b54f8 /sources/shiboken2 | |
| parent | 6c62f0616919b1a715c965f14a40257e717cab9b (diff) | |
Update string treatment for VoidPtr
Task-number: PYSIDE-852
Change-Id: If1ff8407c7f9449be278869e91104372fa86790f
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/libshiboken/voidptr.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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<SbkVoidPtrObject *>(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<SbkVoidPtrObject *>(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, |