Mercurial > pytave
view __py_struct_from_dict__.cc @ 365:087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
* python_to_octave.cc (pytave::pyobj_to_octvalue): Drop conversion of bytes and
unicode objects.
* __py_struct_from_dict__.cc (F__py_string_value__): New function.
* @pyobject/char.m: Define outside class definition, use __py_string_value__.
* @pyobject/pyobject.m: Delete previous pyobject.char definition.
* @pyobject/methods.m: Apply char conversion to __name__ attribute.
* @py/py.m, @pyobject/cell.m, @pyobject/dummy.m, @pyobject/subsasgn.m,
@pyobject/subsref.m, pyargs.m, pycall.cc, pyeval.cc: Adapt examples and tests
to changes.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 25 Aug 2016 14:06:56 -0700 |
parents | b0677c492655 |
children | 4d54fb68de71 |
line wrap: on
line source
/* Copyright (C) 2016 Mike Miller This file is part of Pytave. Pytave is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Pytave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Pytave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include <config.h> #endif #include <Python.h> #include <octave/oct.h> #define PYTAVE_DO_DECLARE_SYMBOL #include "arrayobjectdefs.h" #include "exceptions.h" #include "oct-py-types.h" #include "oct-py-util.h" #include "octave_to_python.h" DEFUN_DLD (__py_int64_scalar_value__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_int64_scalar_value__ (@var{x})\n\ Extract a scalar int64 value from the Python integer @var{x}.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { octave_value_list retval; int nargin = args.length (); if (nargin != 1) { print_usage (); return retval; } if (! (args(0).is_object () && args(0).class_name () == "pyobject")) error ("pyobject.int64: argument must be a Python object"); Py_Initialize (); try { // FIXME: PyObject *obj = look up stored pyobject reference (args(0)); boost::python::object arg; pytave::octvalue_to_pyobj (arg, args(0)); PyObject *obj = arg.ptr (); retval(0) = octave_int64 (pytave::extract_py_int64 (obj)); } catch (pytave::object_convert_exception const &) { error ("pyobject.int64: error in return value type conversion"); } catch (boost::python::error_already_set const &) { std::string message = pytave::fetch_exception_message (); error ("pyobject.int64: %s", message.c_str ()); } return retval; } DEFUN_DLD (__py_isinstance__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_isinstance__ (@var{x})\n\ Check whether the Python object @var{obj} is an instance of a Python type\n\ specified by the string @var{type}.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { octave_value_list retval; int nargin = args.length (); if (nargin != 2) { print_usage (); return retval; } if (! (args(0).is_object () && args(0).class_name () == "pyobject")) error ("pyobject.isa: OBJ must be a Python object"); if (! args(1).is_string ()) error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)"); std::string typestr = args(1).string_value (); if (! ((typestr.size () > 3) && (typestr.compare (0, 3, "py.") == 0))) error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)"); typestr = typestr.substr (3); Py_Initialize (); try { // FIXME: PyObject *obj = look up stored pyobject reference (args(0)); boost::python::object arg; pytave::octvalue_to_pyobj (arg, args(0)); PyObject *obj = arg.ptr (); PyObject *type = pytave::py_find_type (typestr); retval(0) = pytave::py_isinstance (obj, type); Py_XDECREF (type); } catch (pytave::object_convert_exception const &) { error ("pyobject.isa: error in return value type conversion"); } catch (boost::python::error_already_set const &) { std::string message = pytave::fetch_exception_message (); error ("pyobject.isa: %s", message.c_str ()); } return retval; } DEFUN_DLD (__py_objstore_del__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_objstore_del__ (@var{key})\n\ Delete the Python object stored under @var{key} from the object store.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { if (args.length () != 1) print_usage (); Py_Initialize (); uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_del__: KEY must be an integer"); pytave::py_objstore_del (key); return ovl (); } DEFUN_DLD (__py_objstore_get__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_objstore_get__ (@var{key})\n\ Get the Python object stored under @var{key} from the object store.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { if (args.length () != 1) print_usage (); Py_Initialize (); uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_get__: KEY must be an integer"); PyObject *obj = pytave::py_objstore_get (key); if (! obj) error ("__py_objstore_get__: no existing Python object found for key %ju", key); octave_value retval = pytave::pyobject_wrap_object (obj); return ovl (retval); } DEFUN_DLD (__py_objstore_put__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_objstore_put__ (@var{value})\n\ Convert @var{value} to a Python value and store in the object store.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { if (args.length () != 1) print_usage (); Py_Initialize (); boost::python::numeric::array::set_module_and_type ("numpy", "ndarray"); _import_array (); // FIXME: PyObject *obj = convert argument to Python (args(0)); PyObject *obj = 0; try { boost::python::object arg; pytave::octvalue_to_pyobj (arg, args(0)); obj = arg.ptr (); Py_INCREF (obj); } catch (pytave::value_convert_exception const &) { } if (! obj) error ("__py_objstore_put__: VALUE must be convertible to a Python value"); uint64_t key = pytave::py_objstore_put (obj); Py_DECREF (obj); return ovl (octave_uint64 (key)); } DEFUN_DLD (__py_string_value__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_string_value__ (@var{obj})\n\ Return the string value or representation of the Python object @var{obj}.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { if (args.length () != 1) print_usage (); if (! (args(0).is_object () && args(0).class_name () == "pyobject")) error ("pyobject.char: argument must be a valid Python object"); Py_Initialize (); PyObject *obj = pytave::pyobject_unwrap_object (args(0)); if (! obj) error ("pyobject.char: argument must be a valid Python object"); std::string str; if (PyBytes_Check (obj) || PyUnicode_Check (obj)) str = pytave::extract_py_str (obj); else if (Py_TYPE (obj)->tp_str != NULL) { PyObject *s = PyObject_Str (obj); str = pytave::extract_py_str (s); Py_DECREF (s); } else { Py_DECREF (obj); error ("pyobject.char: cannot convert Python object to string"); } Py_DECREF (obj); return ovl (str); } DEFUN_DLD (__py_struct_from_dict__, args, nargout, "-*- texinfo -*-\n\ @deftypefn {} {} __py_struct_from_dict__ (@var{dict})\n\ Extract a scalar struct from the Python dict @var{dict}.\n\ \n\ This is a private internal function not intended for direct use.\n\ @end deftypefn") { octave_value_list retval; std::string id; int nargin = args.length (); if (nargin != 1) { print_usage (); return retval; } if (! (args(0).is_object () && args(0).class_name () == "pyobject")) error ("pyobject.struct: argument must be a Python object"); Py_Initialize (); try { // FIXME: PyObject *obj = look up stored pyobject reference (args(0)); boost::python::object arg; pytave::octvalue_to_pyobj (arg, args(0)); PyObject *obj = arg.ptr (); retval(0) = pytave::extract_py_scalar_map (obj); } catch (pytave::object_convert_exception const &) { error ("pyobject.struct: error in return value type conversion"); } catch (boost::python::error_already_set const &) { std::string message = pytave::fetch_exception_message (); error ("pyobject.struct: %s", message.c_str ()); } return retval; } /* ## No test needed for internal helper function. %!assert (1) */