From 32c6906750b732d5368882c514bd3e50aa6e7669 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Sun, 14 Jul 2002 14:37:20 +0000
Subject: [PATCH] Remove circular dependency on working converters

[SVN r14449]
---
 src/converter/callback.cpp | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/converter/callback.cpp b/src/converter/callback.cpp
index 0685a591..f6bdcbd1 100644
--- a/src/converter/callback.cpp
+++ b/src/converter/callback.cpp
@@ -23,12 +23,12 @@ namespace detail
     {
         if (converters.to_python == 0)
         {
+            handle<> msg(
+                ::PyString_FromFormat(
+                    "No to_python (by-value) converter found for C++ type: %s"
+                    , converters.target_type.name()));
             
-            PyErr_SetObject(
-                PyExc_TypeError
-                , (object("no to_python (by-value) converter found for C++ type: ")
-                   + converters.target_type.name()).ptr()
-                );
+            PyErr_SetObject(PyExc_TypeError, msg.get());
 
             throw_error_already_set();
         }
@@ -56,23 +56,27 @@ namespace detail
       handle<> holder(source);
       if (source->ob_refcnt <= 2)
       {
-          PyErr_SetObject(
-              PyExc_ReferenceError
-              , (object("Attempt to return dangling pointer/reference to object of type ")
-                 + converters.target_type.name()).ptr()
-              );
+          handle<> msg(
+              ::PyString_FromFormat(
+                  "Attempt to return dangling pointer/reference to object of type: %s"
+                  , converters.target_type.name()));
+          
+          PyErr_SetObject(PyExc_ReferenceError, msg.get());
+
           throw_error_already_set();
       }
       void* result = get_lvalue_from_python(source, converters);
       if (!result)
       {
           handle<> repr(PyObject_Repr(source));
-          PyErr_SetObject(
-              PyExc_TypeError
-              , (object("no registered converter was able to convert ")
-                 + repr + " to a C++ lvalue of type "
-                 + converters.target_type.name()).ptr()
-              );
+          handle<> msg(
+              ::PyString_FromFormat(
+                  "No registered converter was able to convert %s to a C++ lvalue of type %s"
+                  , PyString_AS_STRING(repr.get())
+                  , converters.target_type.name()));
+              
+          PyErr_SetObject(PyExc_TypeError, msg.get());
+
           throw_error_already_set();
       }
       return result;