[Boost-commit] svn:boost r81773 - in branches/release: boost/python libs/python libs/python/src/converter

Subject: [Boost-commit] svn:boost r81773 - in branches/release: boost/python libs/python libs/python/src/converter
From: rwgk_at_[hidden]
Date: 2012-12-07 14:51:07

Author: rwgk
Date: 2012-12-07 14:51:06 EST (Fri, 07 Dec 2012)
New Revision: 81773
URL: http://svn.boost.org/trac/boost/changeset/81773

Log:
boost.python: merging trunk to release
Properties modified: 
   branches/release/boost/python/   (props changed)
   branches/release/libs/python/   (props changed)
Text files modified: 
   branches/release/libs/python/src/converter/builtin_converters.cpp |     3 ++-                                     
   1 files changed, 2 insertions(+), 1 deletions(-)

Modified: branches/release/libs/python/src/converter/builtin_converters.cpp
==============================================================================
--- branches/release/libs/python/src/converter/builtin_converters.cpp	(original)
+++ branches/release/libs/python/src/converter/builtin_converters.cpp	2012-12-07 14:51:06 EST (Fri, 07 Dec 2012)
@@ -377,7 +377,8 @@
       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;