Mercurial > pytave
view oct-py-init.cc @ 408:f833e29b2c12
Simplify conversion where existing Python object argument expected (fixes issue #67)
* __py_struct_from_dict__.cc (F__py_isinstance__, F__py_struct_from_dict__):
Use pytave::pyobject_unwrap_object and simplify surrounding code.
* oct-py-types.cc (pytave::extract_py_scalar_map): Raise Octave errors instead
of throwing exceptions, reword error messages.
* @pyobject/pyobject.m: Add %!error tests for struct conversion failure.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Tue, 02 May 2017 10:06:14 -0700 |
parents | 78448e4de20a |
children | 95c6ad0be828 |
line wrap: on
line source
/* Copyright (C) 2017 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 "oct-py-init.h" // FIXME: the following are only needed for Boost.Python library and NumPy // library initialization #define PYTAVE_DO_DECLARE_SYMBOL #include <boost/python.hpp> #include "arrayobjectdefs.h" namespace pytave { #if PY_VERSION_HEX >= 0x03000000 wchar_t *sys_argv[] { L"", nullptr }; #else char *sys_argv[] { "", nullptr }; #endif void py_init () { bool is_initialized = Py_IsInitialized (); Py_Initialize (); if (! is_initialized) PySys_SetArgvEx (1, sys_argv, 0); // FIXME: these are only needed for Boost.Python implicit conversion // of Octave arrays to NumPy arrays boost::python::numeric::array::set_module_and_type ("numpy", "ndarray"); _import_array (); } }