Added SBK_PyString_FromCString and SBK_PyString_FromFormat as helper macro for Py3k port.

2 files changed, 5 insertions, 1 deletions

diff --git a/libshiboken/bindingmanager.cpp b/libshiboken/bindingmanager.cpp
index 77a384b5f..15c478e88 100644
--- a/libshiboken/bindingmanager.cpp
+++ b/libshiboken/bindingmanager.cpp
@@ -241,7 +241,7 @@ PyObject* BindingManager::getOverride(const void* cptr, const char* methodName)
         }
     }
 
-    PyObject* pyMethodName = PyBytes_FromString(methodName);
+    PyObject* pyMethodName = SBK_PyString_FromCString(methodName);
     PyObject* method = PyObject_GetAttr((PyObject*)wrapper, pyMethodName);
 
     if (method && PyMethod_Check(method)
diff --git a/libshiboken/sbkpython.h b/libshiboken/sbkpython.h
index 007a378b7..28b320f0f 100644
--- a/libshiboken/sbkpython.h
+++ b/libshiboken/sbkpython.h
@@ -40,6 +40,8 @@
     #define SBK_NB_BOOL(x) (x).nb_bool
     #define SBK_STR_NAME "bytes"
     #define SBK_PyMethod_New PyMethod_New
+    #define SBK_PyString_FromCString PyUnicode_FromString
+    #define SBK_PyString_FromFormat PyUnicode_FromFormat
 #else
     // Note: if there wasn't for the old-style classes, only a PyNumber_Check would suffice.
     #define SbkNumber_Check(X) \
@@ -47,6 +49,8 @@
     #define SBK_NB_BOOL(x) (x).nb_nonzero
     #define SBK_STR_NAME "str"
     #define SBK_PyMethod_New(X, Y) PyMethod_New(X, Y, (PyObject*)Py_TYPE(Y))
+    #define SBK_PyString_FromCString PyBytes_FromString
+    #define SBK_PyString_FromFormat PyString_FromFormat
 #endif
 
 #endif