All strings passed to Python are now Unicode objects

4 files changed, 131 insertions, 103 deletions

diff --git a/src/py_utils.cc b/src/py_utils.cc
index 364e575f..2736ed3e 100644
--- a/src/py_utils.cc
+++ b/src/py_utils.cc
@@ -75,13 +75,19 @@ typedef register_python_conversion<bool, bool_to_python, bool_from_python>
   bool_python_conversion;
 
 
-#if defined(STRING_VERIFY_ON)
-
 struct string_to_python
 {
-  static PyObject* convert(const ledger::string& str)
+  static PyObject* convert(const string& str)
   {
+#if 1
+    // Return a Unicode object
+    PyObject * pstr = PyString_FromString(str.c_str());
+    PyObject * uni  = PyUnicode_FromEncodedObject(pstr, "UTF-8", NULL);
+    return object(handle<>(borrowed(uni))).ptr();
+#else
+    // Return a 7-bit ASCII string
     return incref(object(static_cast<const std::string&>(str)).ptr());
+#endif
   }
 };
 
@@ -89,75 +95,49 @@ struct string_from_python
 {
   static void* convertible(PyObject* obj_ptr)
   {
-    if (!PyString_Check(obj_ptr)) return 0;
+    if (!PyUnicode_Check(obj_ptr) &&
+	!PyString_Check(obj_ptr)) return 0;
     return obj_ptr;
   }
 
   static void construct(PyObject* obj_ptr,
 			converter::rvalue_from_python_stage1_data* data)
   {
-    const char* value = PyString_AsString(obj_ptr);
-    if (value == 0) throw_error_already_set();
-    void* storage =
-      reinterpret_cast<converter::rvalue_from_python_storage<ledger::string> *>
-                      (data)->storage.bytes;
-    new (storage) ledger::string(value);
-    data->convertible = storage;
+    if (PyString_Check(obj_ptr)) {
+      const char* value = PyString_AsString(obj_ptr);
+      if (value == 0) throw_error_already_set();
+      void* storage =
+	reinterpret_cast<converter::rvalue_from_python_storage<string> *>
+	                (data)->storage.bytes;
+      new (storage) string(value);
+      data->convertible = storage;
+    } else {
+      VERIFY(PyUnicode_Check(obj_ptr));
+
+      Py_ssize_t size = PyUnicode_GET_SIZE(obj_ptr);
+      const Py_UNICODE* value = PyUnicode_AS_UNICODE(obj_ptr);
+
+      string str;
+      if (sizeof(Py_UNICODE) == 2) // UTF-16
+	utf8::unchecked::utf16to8(value, value + size, std::back_inserter(str));
+      else if (sizeof(Py_UNICODE) == 4) // UTF-32
+	utf8::unchecked::utf32to8(value, value + size, std::back_inserter(str));
+      else
+	assert(! "Py_UNICODE has an unexpected size");
+
+      if (value == 0) throw_error_already_set();
+      void* storage =
+	reinterpret_cast<converter::rvalue_from_python_storage<string> *>
+	                (data)->storage.bytes;
+      new (storage) string(str);
+      data->convertible = storage;
+    }
   }
 };
 
-typedef register_python_conversion<ledger::string,
-				   string_to_python, string_from_python>
+typedef register_python_conversion<string, string_to_python, string_from_python>
   string_python_conversion;
 
-#endif // STRING_VERIFY_ON
-
-
-struct unicode_to_python
-{
-  static PyObject* convert(const std::string& utf8str)
-  {
-    PyObject * pstr = PyString_FromString(utf8str.c_str());
-    PyObject * uni  = PyUnicode_FromEncodedObject(pstr, "UTF-8", NULL);
-    return object(handle<>(borrowed(uni))).ptr();
-  }
-};
-
-struct unicode_from_python
-{
-  static void* convertible(PyObject* obj_ptr)
-  {
-    if (!PyUnicode_Check(obj_ptr)) return 0;
-    return obj_ptr;
-  }
-
-  static void construct(PyObject* obj_ptr,
-			converter::rvalue_from_python_stage1_data* data)
-  {
-    Py_ssize_t size = PyUnicode_GET_SIZE(obj_ptr);
-    const Py_UNICODE* value = PyUnicode_AS_UNICODE(obj_ptr);
-
-    std::string str;
-    if (sizeof(Py_UNICODE) == 2) // UTF-16
-      utf8::unchecked::utf16to8(value, value + size, std::back_inserter(str));
-    else if (sizeof(Py_UNICODE) == 4) // UTF-32
-      utf8::unchecked::utf32to8(value, value + size, std::back_inserter(str));
-    else
-      assert(! "Py_UNICODE has an unexpected size");
-
-    if (value == 0) throw_error_already_set();
-    void* storage =
-      reinterpret_cast<converter::rvalue_from_python_storage<std::string> *>
-                      (data)->storage.bytes;
-    new (storage) std::string(str);
-    data->convertible = storage;
-  }
-};
-
-typedef register_python_conversion<std::string,
-				   unicode_to_python, unicode_from_python>
-  unicode_python_conversion;
-
 
 struct istream_to_python
 {
@@ -273,10 +253,7 @@ void export_utils()
     ;
 
   bool_python_conversion();
-#if defined(STRING_VERIFY_ON)
   string_python_conversion();
-#endif
-  unicode_python_conversion();
   istream_python_conversion();
   ostream_python_conversion();
 }
diff --git a/src/pyutils.h b/src/pyutils.h
index 5709eb35..a9e968e0 100644
--- a/src/pyutils.h
+++ b/src/pyutils.h
@@ -36,7 +36,7 @@ template <typename T, typename TfromPy>
 struct object_from_python
 {
   object_from_python() {
-    boost::python::converter::registry::push_back
+    boost::python::converter::registry::insert
       (&TfromPy::convertible, &TfromPy::construct,
        boost::python::type_id<T>());
   }
@@ -106,6 +106,55 @@ struct register_optional_to_python : public boost::noncopyable
   }
 };
 
+namespace boost { namespace python {
+
+// Use expr to create the PyObject corresponding to x
+# define BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(T, expr, pytype)\
+    template <> struct to_python_value<T&>                      \
+        : detail::builtin_to_python                             \
+    {                                                           \
+        inline PyObject* operator()(T const& x) const           \
+        {                                                       \
+            return (expr);                                      \
+        }                                                       \
+        inline PyTypeObject const* get_pytype() const           \
+        {                                                       \
+            return (pytype);                                    \
+        }                                                       \
+    };                                                          \
+    template <> struct to_python_value<T const&>                \
+        : detail::builtin_to_python                             \
+    {                                                           \
+        inline PyObject* operator()(T const& x) const           \
+        {                                                       \
+            return (expr);                                      \
+        }                                                       \
+        inline PyTypeObject const* get_pytype() const           \
+        {                                                       \
+            return (pytype);                                    \
+        }                                                       \
+    };
+
+# define BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE(T, expr)   \
+    namespace converter                                 \
+    {                                                   \
+      template <> struct arg_to_python< T >             \
+        : handle<>                                      \
+      {                                                 \
+          arg_to_python(T const& x)                     \
+            : python::handle<>(expr) {}                 \
+      };                                                \
+    } 
+
+// Specialize argument and return value converters for T using expr
+# define BOOST_PYTHON_TO_PYTHON_BY_VALUE(T, expr, pytype)  \
+        BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(T,expr, pytype)  \
+        BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE(T,expr)
+
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(ledger::string, ::PyUnicode_FromEncodedObject(::PyString_FromString(x.c_str()), "UTF-8", NULL), &PyUnicode_Type)
+
+} } // namespace boost::python
+
 //boost::python::register_ptr_to_python< boost::shared_ptr<Base> >();
 
 #endif // _PY_UTILS_H
diff --git a/src/utils.cc b/src/utils.cc
index 2f2899fb..6cef1a8c 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -406,8 +406,16 @@ void report_memory(std::ostream& out, bool report_all)
   }
 }
 
+} // namespace ledger
+
+#endif // VERIFY_ON
+
+/**********************************************************************
+ *
+ * String wrapper
+ */
 
-#if defined(STRING_VERIFY_ON)
+namespace ledger {
 
 string::string() : std::string() {
   TRACE_CTOR(string, "");
@@ -445,18 +453,10 @@ string::~string() throw() {
   TRACE_DTOR(string);
 }
 
-#endif // STRING_VERIFY_ON
+string empty_string("");
 
-} // namespace ledger
-
-#endif // VERIFY_ON
-
-ledger::string empty_string("");
-
-ledger::strings_list split_arguments(const char * line)
+strings_list split_arguments(const char * line)
 {
-  using namespace ledger;
-
   strings_list args;
 
   char buf[4096];
@@ -506,6 +506,8 @@ ledger::strings_list split_arguments(const char * line)
   return args;
 }
 
+} // namespace ledger
+
 /**********************************************************************
  *
  * Logging
diff --git a/src/utils.h b/src/utils.h
index bfdee0b2..8ddc3c44 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -62,10 +62,6 @@
 #define TIMERS_ON   1
 #endif
 
-#if defined(VERIFY_ON)
-//#define STRING_VERIFY_ON 1
-#endif
-
 /*@}*/
 
 /**
@@ -76,11 +72,7 @@
 namespace ledger {
   using namespace boost;
 
-#if defined(STRING_VERIFY_ON)
   class string;
-#else
-  typedef std::string string;
-#endif
 
   typedef std::list<string> strings_list;
 
@@ -162,12 +154,33 @@ void trace_dtor_func(void * ptr, const char * cls_name, std::size_t cls_size);
 
 void report_memory(std::ostream& out, bool report_all = false);
 
-#if defined(STRING_VERIFY_ON)
+} // namespace ledger
+
+#else // ! VERIFY_ON
+
+#define VERIFY(x)
+#define DO_VERIFY() true
+#define TRACE_CTOR(cls, args)
+#define TRACE_DTOR(cls)
+
+#endif // VERIFY_ON
+
+#define IF_VERIFY() if (DO_VERIFY())
+
+/*@}*/
 
 /**
- * This string type is a wrapper around std::string that allows us to
- * trace constructor and destructor calls.
+ * @name String wrapper
+ *
+ * This string type is a wrapper around std::string that allows us to trace
+ * constructor and destructor calls.  It also makes ledger's use of strings a
+ * unique type, that the Boost.Python code can use as the basis for
+ * transparent Unicode conversions.
  */
+/*@{*/
+
+namespace ledger {
+
 class string : public std::string
 {
 public:
@@ -240,24 +253,11 @@ inline bool operator!=(const char* __lhs, const string& __rhs)
 inline bool operator!=(const string& __lhs, const char* __rhs)
 { return __lhs.compare(__rhs) != 0; }
 
-#endif // STRING_VERIFY_ON
+extern string empty_string;
 
-} // namespace ledger
-
-#else // ! VERIFY_ON
+strings_list split_arguments(const char * line);
 
-#define VERIFY(x)
-#define DO_VERIFY() true
-#define TRACE_CTOR(cls, args)
-#define TRACE_DTOR(cls)
-
-#endif // VERIFY_ON
-
-extern ledger::string empty_string;
-
-ledger::strings_list split_arguments(const char * line);
-
-#define IF_VERIFY() if (DO_VERIFY())
+} // namespace ledger
 
 /*@}*/