boost.python: merging trunk to release

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit a3f478e9af35 · 2012-12-07T19:51:06.000Z
[SVN r81773]
diff --git a/src/converter/builtin_converters.cpp b/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;
 

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,8 @@ namespace`
`377`	`377`	`static unaryfunc* get_slot(PyObject* obj)`
`378`	`378`	`{`
`379`	`379`	`#if PY_VERSION_HEX >= 0x03000000`
`380`		`- return (PyUnicode_Check(obj)) ? &py_unicode_as_string_unaryfunc : 0;`
	`380`	`+ return (PyUnicode_Check(obj)) ? &py_unicode_as_string_unaryfunc :`
	`381`	`+ PyBytes_Check(obj) ? &py_object_identity : 0;`
`381`	`382`	`#else`
`382`	`383`	`return (PyString_Check(obj)) ? &obj->ob_type->tp_str : 0;`
`383`	`384`