diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
| commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
| tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /libs/python/src | |
| parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
| download | boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.gz boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.bz2 boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.zip | |
Imported Upstream version 1.57.0upstream/1.57.0
Diffstat (limited to 'libs/python/src')
| -rw-r--r-- | libs/python/src/converter/builtin_converters.cpp | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | libs/python/src/wrapper.cpp | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/python/src/converter/builtin_converters.cpp b/libs/python/src/converter/builtin_converters.cpp index c7c95ea823..9900602b77 100644 --- a/libs/python/src/converter/builtin_converters.cpp +++ b/libs/python/src/converter/builtin_converters.cpp @@ -377,7 +377,8 @@ namespace static unaryfunc* get_slot(PyObject* obj) { #if PY_VERSION_HEX >= 0x03000000 - return (PyUnicode_Check(obj)) ? &py_unicode_as_string_unaryfunc : 0; + return (PyUnicode_Check(obj)) ? &py_unicode_as_string_unaryfunc : + PyBytes_Check(obj) ? &py_object_identity : 0; #else return (PyString_Check(obj)) ? &obj->ob_type->tp_str : 0; diff --git a/libs/python/src/wrapper.cpp b/libs/python/src/wrapper.cpp index f8feaef947..f8feaef947 100644..100755 --- a/libs/python/src/wrapper.cpp +++ b/libs/python/src/wrapper.cpp |