Mercurial > pytave
view oct-py-util.cc @ 333:96b78e78a235
pycall: add support for keyword arguments from pyargs (fixes issue #45)
* oct-py-util.cc, oct-py-util.h (pytave::py_object_class_name,
pytave::is_py_kwargs_argument, pytave::update_py_dict): New functions.
* pycall.cc (Fpycall): Check for and handle keyword arguments.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Mon, 15 Aug 2016 13:20:15 -0700 |
parents | cee203ea6245 |
children | 7f039ffe501b |
line wrap: on
line source
/* Copyright (C) 2016 Abhinav Tripathi 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 <oct.h> #include <octave/parse.h> #include "oct-py-types.h" #include "oct-py-util.h" using namespace boost::python; namespace pytave { void get_builtins_module (boost::python::object& builtins_module) { #if PY_VERSION_HEX >= 0x03000000 builtins_module = import ("builtins"); #else builtins_module = import ("__builtin__"); #endif } void get_object_from_python (const octave_value& oct_value, boost::python::object& py_object) { bool by_name; if (oct_value.is_string ()) by_name = true; else if (oct_value.is_object () && oct_value.class_name () == "pyobject") by_name = false; else { py_object = boost::python::object(); //None return; } object main_module = import ("__main__"); object builtins_module; get_builtins_module (builtins_module); if (by_name) { std::string module; std::string func = oct_value.string_value (); size_t idx = func.rfind ("."); if (idx != std::string::npos) { module = func.substr (0, idx); func = func.substr (idx + 1); } object mod; if (module.empty ()) { if (PyObject_HasAttrString (main_module.ptr (), func.c_str ())) mod = main_module; else mod = builtins_module; } else mod = import (module.c_str ()); py_object = mod.attr (func.c_str ()); } else { octave_value_list tmp = feval ("getid", ovl (oct_value), 1); std::string hexid = tmp(0).string_value (); py_object = main_module.attr ("__InOct__")[hexid]; } } std::string py_object_class_name (PyObject *obj) { PyObject *class_ = obj ? PyObject_GetAttrString (obj, "__class__") : 0; PyObject *name_ = class_ ? PyObject_GetAttrString (class_, "__name__") : 0; return name_ ? extract_py_str (name_): ""; } bool is_py_kwargs_argument (PyObject *obj) { if (obj && py_object_class_name (obj) == "_OctaveKwargs" && PyObject_HasAttrString (obj, "is_kwargs_argument")) { PyObject *flag = PyObject_GetAttrString (obj, "is_kwargs_argument"); if (flag && PyBool_Check (flag) && PyObject_IsTrue (flag)) return true; } return false; } PyObject * update_py_dict (PyObject *dict_orig, PyObject *dict_new) { PyObject *dict = dict_orig ? dict_orig : PyDict_New (); PyDict_Update (dict, dict_new); return dict; } }