Mercurial > pytave

comparison python_to_octave.cc @ 353:826a23f63f75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Return pyobject constructed from Python value correctly (fixes issue #66) * python_to_octave.cc (pytave::pyobj_to_oct_pyobject): Handle return value list from feval() correctly.
author Mike Miller <mtmiller@octave.org>
date Mon, 22 Aug 2016 14:55:19 -0700
parents e89a8a37fd8a
children b0677c492655
comparison
equal deleted inserted replaced
352:eac35d84ef0d 353:826a23f63f75
326 if (! PyObject_HasAttrString (main_module.ptr (), "_in_octave")) 326 if (! PyObject_HasAttrString (main_module.ptr (), "_in_octave"))
327 main_module.attr ("_in_octave") = boost::python::dict (); 327 main_module.attr ("_in_octave") = boost::python::dict ();
328 328
329 main_module.attr ("_in_octave")[id] = py_object; 329 main_module.attr ("_in_octave")[id] = py_object;
330 // Create @pyobject 330 // Create @pyobject
331 oct_value = feval ("pyobject", ovl (0, id), 2); 331 oct_value = feval ("pyobject", ovl (0, id), 1)(0);
332 } 332 }
333 333
334 void pyobj_to_octvalue (octave_value& oct_value, 334 void pyobj_to_octvalue (octave_value& oct_value,
335 const boost::python::object& py_object) 335 const boost::python::object& py_object)
336 { 336 {