diff oct-py-types.h @ 325:fd5881d48238

Overhaul Python string creation and extraction * oct-py-types.cc, oct-py-types.h (pytave::extract_py_str, pytave::make_py_str): New functions to create a Python string and extract string value from Python. (pytave::make_py_dict): Use make_py_str. * octave_to_python.cc (pytave::octvalue_to_pyobj): Use make_py_str. (pytave::octstring_to_pyobject): Delete. * python_to_octave.cc (pytave::pyobj_to_octvalue): Use extract_py_str. (pytave::pyunicode_to_utf8): Delete.
author Mike Miller <mtmiller@octave.org>
date Sat, 13 Aug 2016 19:29:47 -0700
parents c2aa34730dc9
children 5782d7932529
line wrap: on
line diff
--- a/oct-py-types.h	Fri Aug 12 00:57:46 2016 -0700
+++ b/oct-py-types.h	Sat Aug 13 19:29:47 2016 -0700
@@ -24,6 +24,7 @@
 #define pytave_oct_py_types_h 1
 
 #include <Python.h>
+#include <string>
 
 class octave_scalar_map;
 
@@ -33,6 +34,12 @@
 PyObject *
 make_py_dict (const octave_scalar_map& map);
 
+std::string
+extract_py_str (PyObject *obj);
+
+PyObject *
+make_py_str (const std::string& str);
+
 }
 
 #endif