pytave: pyexec.cc annotate

annotate pyexec.cc @ 423:6b9de18b4bdd

Eliminate remaining custom exception handling in favor of Octave errors * oct-py-error.cc, oct-py-error.h (pytave::error_python_exception): New function to generate an Octave error from an active Python error condition, based on pytave::fetch_exception_message. * oct-py-eval.cc (pytave::py_call_function, pytave::py_run_string_safe): Use it. * oct-py-types.cc (pytave::make_py_dict): Likewise. * oct-py-util.cc (pytave::py_objstore): Likewise. * pycall.cc (Fpycall): Remove exception handling logic. * pyeval.cc (Fpyeval): Likewise. * pyexec.cc (Fpyexec): Likewise. * exceptions.cc, exceptions.h: Delete. * Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Remove them.

author	Mike Miller <mtmiller@octave.org>
date	Thu, 04 May 2017 21:15:07 -0700
parents	8247f298fd16
children	3af3665348a1

rev	line source
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	1 /*
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	2
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	3 Copyright (C) 2016 Colin B. Macdonald
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	4
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	5 This file is part of Pytave.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	6
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	7 Pytave is free software; you can redistribute it and/or modify it
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by the
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	10 option) any later version.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	11
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	12 Pytave is distributed in the hope that it will be useful, but WITHOUT
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	15 for more details.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	16
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	18 along with Pytave; see the file COPYING. If not, see
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	19 <http://www.gnu.org/licenses/>.
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	20
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	21 */
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	22
162 df7b4a5ab542 Apply recent project changes to pyeval/pyexec, clean up Mike Miller <mtmiller@octave.org> parents: 161 diff changeset	23 #if defined (HAVE_CONFIG_H)
df7b4a5ab542 Apply recent project changes to pyeval/pyexec, clean up Mike Miller <mtmiller@octave.org> parents: 161 diff changeset	24 # include <config.h>
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	25 #endif
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	26
421 24555fba9964 Include <Python.h> first to suppress possible redefinition warnings Mike Miller <mtmiller@octave.org> parents: 420 diff changeset	27 #include <Python.h>
24555fba9964 Include <Python.h> first to suppress possible redefinition warnings Mike Miller <mtmiller@octave.org> parents: 420 diff changeset	28 #include <octave/oct.h>
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	29
335 9b862844e6b7 Enable Python print function in evaluated expressions (fixes issue #48) Mike Miller <mtmiller@octave.org> parents: 331 diff changeset	30 #include "oct-py-eval.h"
405 478d83448b0b Refactor Python initialization into a common function Mike Miller <mtmiller@octave.org> parents: 403 diff changeset	31 #include "oct-py-init.h"
331 cee203ea6245 Rename oct-py-util.cc from pytave_utils.cc Mike Miller <mtmiller@octave.org> parents: 316 diff changeset	32 #include "oct-py-util.h"
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	33
420 7864849e84c2 Eliminate some compiler warnings Mike Miller <mtmiller@octave.org> parents: 415 diff changeset	34 DEFUN_DLD (pyexec, args, ,
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	35 "-- texinfo --\n\
316 a140160b2319 doc: clean up pyeval and pyexec doc strings Mike Miller <mtmiller@octave.org> parents: 307 diff changeset	36 @deftypefn {} {} pyexec (@var{expr})\n\
a140160b2319 doc: clean up pyeval and pyexec doc strings Mike Miller <mtmiller@octave.org> parents: 307 diff changeset	37 @deftypefnx {} {} pyexec (@var{expr}, @var{localns})\n\
173 28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	38 Execute a Python expression or block of code.\n\
316 a140160b2319 doc: clean up pyeval and pyexec doc strings Mike Miller <mtmiller@octave.org> parents: 307 diff changeset	39 \n\
a140160b2319 doc: clean up pyeval and pyexec doc strings Mike Miller <mtmiller@octave.org> parents: 307 diff changeset	40 When called with an optional second argument, @var{localns} is a\n\
a140160b2319 doc: clean up pyeval and pyexec doc strings Mike Miller <mtmiller@octave.org> parents: 307 diff changeset	41 @code{py.dict} that acts as the namespace for any assignments or other\n\
a140160b2319 doc: clean up pyeval and pyexec doc strings Mike Miller <mtmiller@octave.org> parents: 307 diff changeset	42 side effects of the expression.\n\
173 28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	43 \n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	44 Examples:\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	45 @example\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	46 @group\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	47 pyexec (\"print(42)\")\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	48 @print{} 42\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	49 @end group\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	50 @end example\n\
28dc607532c2 doc: Clarify and clean up docstrings for all oct files Mike Miller <mtmiller@octave.org> parents: 162 diff changeset	51 @seealso{pycall, pyeval}\n\
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	52 @end deftypefn")
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	53 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	54 octave_value_list retval;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	55
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	56 int nargin = args.length ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	57
307 b4e56f7255f7 Add option to specify namespace when calling pyexec and pyeval (fixes issue #25) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 232 diff changeset	58 if (nargin < 1 \|\| nargin > 2)
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	59 {
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	60 print_usage ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	61 return retval;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	62 }
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	63
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	64 std::string code = args(0).string_value ();
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	65
405 478d83448b0b Refactor Python initialization into a common function Mike Miller <mtmiller@octave.org> parents: 403 diff changeset	66 pytave::py_init ();
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	67
403 3644df6564bc maint: use C++11 nullptr rather than 0 or NULL Mike Miller <mtmiller@octave.org> parents: 364 diff changeset	68 PyObject *local_namespace = nullptr;
307 b4e56f7255f7 Add option to specify namespace when calling pyexec and pyeval (fixes issue #25) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 232 diff changeset	69 if (nargin > 1)
364 1470ed26917a Use pyobject_unwrap_object when an existing PyObject is expected Mike Miller <mtmiller@octave.org> parents: 335 diff changeset	70 {
1470ed26917a Use pyobject_unwrap_object when an existing PyObject is expected Mike Miller <mtmiller@octave.org> parents: 335 diff changeset	71 local_namespace = pytave::pyobject_unwrap_object (args(1));
1470ed26917a Use pyobject_unwrap_object when an existing PyObject is expected Mike Miller <mtmiller@octave.org> parents: 335 diff changeset	72 if (! local_namespace)
1470ed26917a Use pyobject_unwrap_object when an existing PyObject is expected Mike Miller <mtmiller@octave.org> parents: 335 diff changeset	73 error ("pyexec: NAMESPACE must be a valid Python reference");
1470ed26917a Use pyobject_unwrap_object when an existing PyObject is expected Mike Miller <mtmiller@octave.org> parents: 335 diff changeset	74 }
226 382bb1d91239 maint: import standard Python names consistently Mike Miller <mtmiller@octave.org> parents: 173 diff changeset	75
423 6b9de18b4bdd Eliminate remaining custom exception handling in favor of Octave errors Mike Miller <mtmiller@octave.org> parents: 422 diff changeset	76 // FIXME: figure out exec return code:
6b9de18b4bdd Eliminate remaining custom exception handling in favor of Octave errors Mike Miller <mtmiller@octave.org> parents: 422 diff changeset	77 pytave::py_exec_string (code, 0, local_namespace);
6b9de18b4bdd Eliminate remaining custom exception handling in favor of Octave errors Mike Miller <mtmiller@octave.org> parents: 422 diff changeset	78
161 dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	79 return retval;
dfea7eee7749 add pyexec and pyeval commands Colin Macdonald <cbm@m.fsf.org> parents: diff changeset	80 }
231 6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	81
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	82 /*
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	83 %!error <NameError>
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	84 %! pyexec ("raise NameError ('oops')")
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	85
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	86 %!error <AttributeError>
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	87 %! pyexec ("import sys")
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	88 %! pyexec ("sys.no_such_thing")
6fffa6219b2c Properly extract exception text from Python (fixes issue #24) Abhinav Tripathi <genuinelucifer@gmail.com> parents: 173 diff changeset	89 */

Mercurial > pytave

annotate pyexec.cc @ 423:6b9de18b4bdd