Mercurial > pytave
annotate pyeval.cc @ 422:8247f298fd16
Raise Octave errors instead of exceptions for conversion errors
* Makefile.am (COMMON_SOURCE_FILES): Include oct-py-error.cc in the list.
(PYTAVE_HEADER_FILES): Include oct-py-error.h in the list.
* oct-py-error.cc, oct-py-error.h: New files defining error conditions.
* oct-py-types.cc (pytave::extract_py_bool, pytave::extract_py_complex,
pytave::extract_py_float, pytave::make_py_array, pytave::extract_py_scalar_map,
pytave::extract_py_int64, pytave::extract_py_uint64, pytave::extract_py_str):
Use new error condition functions instead of throwing exceptions.
(pytave::make_py_array, pytave::make_py_numeric_value, pytave::make_py_tuple):
Raise Octave error instead of throwing exceptions.
* __py_struct_from_dict__.cc (F__py_int64_scalar_value__,
F__py_uint64_scalar_value__): Remove exception handling logic.
* pycall.cc (Fpycall): Remove conversion exception handlers.
* pyeval.cc (Fpyeval): Likewise.
* pyexec.cc (Fpyexec): Likewise.
* exceptions.h (pytave::pytave_exception, pytave::octave_error_exception,
pytave::octave_parse_exception, pytave::value_convert_exception,
pytave::object_convert_exception, pytave::variable_name_exception): Delete
no longer used exception types.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 04 May 2017 17:13:38 -0700 |
parents | 24555fba9964 |
children | 6b9de18b4bdd |
rev | line source |
---|---|
161 | 1 /* |
2 | |
3 Copyright (C) 2016 Colin B. Macdonald | |
4 | |
5 This file is part of Pytave. | |
6 | |
7 Pytave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
9 Free Software Foundation; either version 3 of the License, or (at your | |
10 option) any later version. | |
11 | |
12 Pytave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
18 along with Pytave; see the file COPYING. If not, see | |
19 <http://www.gnu.org/licenses/>. | |
20 | |
21 */ | |
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 | 25 #endif |
26 | |
421
24555fba9964
Include <Python.h> first to suppress possible redefinition warnings
Mike Miller <mtmiller@octave.org>
parents:
415
diff
changeset
|
27 #include <Python.h> |
24555fba9964
Include <Python.h> first to suppress possible redefinition warnings
Mike Miller <mtmiller@octave.org>
parents:
415
diff
changeset
|
28 #include <octave/oct.h> |
161 | 29 |
30 #include "exceptions.h" | |
335
9b862844e6b7
Enable Python print function in evaluated expressions (fixes issue #48)
Mike Miller <mtmiller@octave.org>
parents:
331
diff
changeset
|
31 #include "oct-py-eval.h" |
405
478d83448b0b
Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents:
403
diff
changeset
|
32 #include "oct-py-init.h" |
411
3613ffbd52b2
Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents:
410
diff
changeset
|
33 #include "oct-py-object.h" |
3613ffbd52b2
Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents:
410
diff
changeset
|
34 #include "oct-py-types.h" |
331
cee203ea6245
Rename oct-py-util.cc from pytave_utils.cc
Mike Miller <mtmiller@octave.org>
parents:
327
diff
changeset
|
35 #include "oct-py-util.h" |
161 | 36 |
37 DEFUN_DLD (pyeval, args, nargout, | |
38 "-*- texinfo -*-\n\ | |
173
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
39 @deftypefn {} {} pyeval (@var{expr})\n\ |
316
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
40 @deftypefnx {} {} pyeval (@var{expr}, @var{localns})\n\ |
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
41 @deftypefnx {} {@var{x} =} pyeval (@dots{})\n\ |
173
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
42 Evaluate a Python expression and return the result.\n\ |
316
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
43 \n\ |
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
44 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
|
45 @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
|
46 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
|
47 \n\ |
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
48 Examples:\n\ |
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
49 @example\n\ |
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
50 @group\n\ |
176 | 51 pyexec (\"import sys\")\n\ |
173
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
52 pyeval (\"sys.version\")\n\ |
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
53 @result{} ...\n\ |
316
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
54 pyeval (\"dict(two=2)\")\n\ |
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
55 @result{} [pyobject ...]\n\ |
a140160b2319
doc: clean up pyeval and pyexec doc strings
Mike Miller <mtmiller@octave.org>
parents:
307
diff
changeset
|
56 @{'two': 2@}\n\ |
173
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
57 @end group\n\ |
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
58 @end example\n\ |
28dc607532c2
doc: Clarify and clean up docstrings for all oct files
Mike Miller <mtmiller@octave.org>
parents:
162
diff
changeset
|
59 @seealso{pycall, pyexec}\n\ |
161 | 60 @end deftypefn") |
61 { | |
62 octave_value_list retval; | |
63 | |
64 int nargin = args.length (); | |
65 | |
307
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
66 if (nargin < 1 || nargin > 2) |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
67 { |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
68 print_usage (); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
69 return retval; |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
70 } |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
71 |
161 | 72 std::string code = args(0).string_value (); |
73 | |
405
478d83448b0b
Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents:
403
diff
changeset
|
74 pytave::py_init (); |
161 | 75 |
403
3644df6564bc
maint: use C++11 nullptr rather than 0 or NULL
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
76 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:
279
diff
changeset
|
77 if (nargin > 1) |
364
1470ed26917a
Use pyobject_unwrap_object when an existing PyObject is expected
Mike Miller <mtmiller@octave.org>
parents:
360
diff
changeset
|
78 { |
1470ed26917a
Use pyobject_unwrap_object when an existing PyObject is expected
Mike Miller <mtmiller@octave.org>
parents:
360
diff
changeset
|
79 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:
360
diff
changeset
|
80 if (! local_namespace) |
1470ed26917a
Use pyobject_unwrap_object when an existing PyObject is expected
Mike Miller <mtmiller@octave.org>
parents:
360
diff
changeset
|
81 error ("pyeval: NAMESPACE must be a valid Python reference"); |
1470ed26917a
Use pyobject_unwrap_object when an existing PyObject is expected
Mike Miller <mtmiller@octave.org>
parents:
360
diff
changeset
|
82 } |
202
3fa99babc7b5
pyeval: preliminary support for returning pyobj
Colin Macdonald <cbm@m.fsf.org>
parents:
173
diff
changeset
|
83 |
161 | 84 try |
85 { | |
411
3613ffbd52b2
Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents:
410
diff
changeset
|
86 pytave::python_object res = pytave::py_eval_string (code, 0, local_namespace); |
162
df7b4a5ab542
Apply recent project changes to pyeval/pyexec, clean up
Mike Miller <mtmiller@octave.org>
parents:
161
diff
changeset
|
87 |
247
c3addc52dfcd
pyeval: allow evaluated value of None (fixes issue #31)
Mike Miller <mtmiller@octave.org>
parents:
235
diff
changeset
|
88 if (nargout > 0 || ! res.is_none ()) |
411
3613ffbd52b2
Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents:
410
diff
changeset
|
89 retval(0) = pytave::py_implicitly_convert_return_value (res); |
161 | 90 } |
415
9bf8ba050122
Replace all remaining Boost.Python references
Mike Miller <mtmiller@octave.org>
parents:
411
diff
changeset
|
91 catch (pytave::error_already_set const &) |
161 | 92 { |
231
6fffa6219b2c
Properly extract exception text from Python (fixes issue #24)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
190
diff
changeset
|
93 std::string message = pytave::fetch_exception_message (); |
6fffa6219b2c
Properly extract exception text from Python (fixes issue #24)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
190
diff
changeset
|
94 error ("pyeval: %s", message.c_str ()); |
161 | 95 } |
96 | |
97 return retval; | |
98 } | |
180
5f0d94afebe2
Added some basic tests
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
176
diff
changeset
|
99 |
5f0d94afebe2
Added some basic tests
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
176
diff
changeset
|
100 /* |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
101 %!assert (isnumeric (double (pyeval ("0")))) |
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
102 %!assert (isreal (double (pyeval ("0")))) |
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
103 %!assert (double (pyeval ("0")), 0) |
180
5f0d94afebe2
Added some basic tests
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
176
diff
changeset
|
104 |
190
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
105 %!assert (isnumeric (pyeval ("10.1"))) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
106 %!assert (isreal (pyeval ("10.1"))) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
107 %!assert (pyeval ("10.1"), 10.1) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
108 |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
109 %!assert (isnumeric (pyeval ("2j"))) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
110 %!assert (iscomplex (pyeval ("2j"))) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
111 %!assert (pyeval ("2j"), 2j) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
112 |
365
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
364
diff
changeset
|
113 %!assert (ischar (char (pyeval ("\"I <3 Octave\"")))) |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
364
diff
changeset
|
114 %!assert (char (pyeval ("\"I <3 Octave\"")), "I <3 Octave") |
180
5f0d94afebe2
Added some basic tests
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
176
diff
changeset
|
115 |
183
2b03585d4ddd
Add proper conversion of booleans between octave and python. (fixes issue #6)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
182
diff
changeset
|
116 %!assert (islogical (pyeval ("True"))) |
2b03585d4ddd
Add proper conversion of booleans between octave and python. (fixes issue #6)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
182
diff
changeset
|
117 %!assert (islogical (pyeval ("False"))) |
190
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
118 %!assert (pyeval ("True"), true) |
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
119 %!assert (pyeval ("False"), false) |
183
2b03585d4ddd
Add proper conversion of booleans between octave and python. (fixes issue #6)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
182
diff
changeset
|
120 %!assert (class (pyeval ("True")), "logical") |
2b03585d4ddd
Add proper conversion of booleans between octave and python. (fixes issue #6)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
182
diff
changeset
|
121 %!assert (class (pyeval ("False")), "logical") |
2b03585d4ddd
Add proper conversion of booleans between octave and python. (fixes issue #6)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
182
diff
changeset
|
122 |
235
bbf0b7a4e117
Return pyobject from pycall too, similar to pyeval (fixes issue #28)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
232
diff
changeset
|
123 %!assert (isa (pyeval ("object()"), "pyobject")) |
bbf0b7a4e117
Return pyobject from pycall too, similar to pyeval (fixes issue #28)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
232
diff
changeset
|
124 |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
125 %!assert (isnumeric (double (pyeval ("__import__('sys').maxsize")))) |
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
126 %!assert (double (pyeval ("99999999999999")), 99999999999999) |
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
127 %!assert (double (pyeval ("-99999999999999")), -99999999999999) |
271
0a4f620da178
Convert numeric value to long instead of int to avoid overflow (fixes issue #40)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
128 |
278
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
129 %!test |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
130 %! z = pyeval ("{'x': 1., 'y': 2.}"); |
278
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
131 %! assert (isa (z, "pyobject")) |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
132 %! assert (z{"x"}, 1) |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
133 |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
134 %!test |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
135 %! z = pyeval ("[1., 2., 3.]"); |
278
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
136 %! assert (isa (z, "pyobject")) |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
137 %! assert ({z{1}, z{2}, z{3}}, {1, 2, 3}) |
190
ac377ace2ee4
More unit tests of pycall and pyeval
Mike Miller <mtmiller@octave.org>
parents:
183
diff
changeset
|
138 |
180
5f0d94afebe2
Added some basic tests
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
176
diff
changeset
|
139 %!test |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
140 %! z = pyeval ("(4., 5., 6.)"); |
278
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
141 %! assert (isa (z, "pyobject")) |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
142 %! assert ({z{1}, z{2}, z{3}}, {4, 5, 6}) |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
143 |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
144 %!test |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
145 %! z = pyeval ("[1., [21., 22.], 3., [41., [421., 422.], 43.]]"); |
278
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
146 %! assert (isa (z, "pyobject")) |
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
147 %! assert (isa (z{2}, "pyobject")) |
182
0bf4b7cf16ee
maint: Use Octave coding style conventions for unit tests
Mike Miller <mtmiller@octave.org>
parents:
180
diff
changeset
|
148 %! assert (z{2}{1}, 21) |
0bf4b7cf16ee
maint: Use Octave coding style conventions for unit tests
Mike Miller <mtmiller@octave.org>
parents:
180
diff
changeset
|
149 %! assert (z{2}{2}, 22) |
278
9278a272b1c8
Drop conversion of lists, dicts and tuples (fixes issues #27, #26)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
247
diff
changeset
|
150 %! assert (isa (z{4}{2}, "pyobject")) |
182
0bf4b7cf16ee
maint: Use Octave coding style conventions for unit tests
Mike Miller <mtmiller@octave.org>
parents:
180
diff
changeset
|
151 %! assert (z{4}{2}{1}, 421) |
0bf4b7cf16ee
maint: Use Octave coding style conventions for unit tests
Mike Miller <mtmiller@octave.org>
parents:
180
diff
changeset
|
152 %! assert (z{4}{2}{2}, 422) |
231
6fffa6219b2c
Properly extract exception text from Python (fixes issue #24)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
190
diff
changeset
|
153 |
6fffa6219b2c
Properly extract exception text from Python (fixes issue #24)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
190
diff
changeset
|
154 %!error <NameError> |
263
0fc1a58d7e89
Delete unnecessary newlines in one-line function definitions
Mike Miller <mtmiller@octave.org>
parents:
247
diff
changeset
|
155 %! pyexec ("def raiseException(): raise NameError ('oops')") |
0fc1a58d7e89
Delete unnecessary newlines in one-line function definitions
Mike Miller <mtmiller@octave.org>
parents:
247
diff
changeset
|
156 %! pyeval ("raiseException()") |
307
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
157 |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
158 %!test |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
159 %! % Variable defined in global namespace is available locally |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
160 %! myNS = pyeval ("{}"); |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
161 %! pyexec ("myvar = 1.") |
307
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
162 %! assert (pyeval ("myvar", myNS), 1); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
163 |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
164 %!test |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
165 %! % Variables with same name can have different values in different namespaces |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
166 %! myNS1 = pyeval ("{}"); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
167 %! myNS2 = pyeval ("{}"); |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
168 %! pyexec ("myvar = 1.") |
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
169 %! pyexec ("myvar = 2.", myNS1) |
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
170 %! pyexec ("myvar = 3.", myNS2) |
307
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
171 %! assert (pyeval ("myvar"), 1) |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
172 %! assert (pyeval ("myvar", myNS1), 2) |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
173 %! assert (pyeval ("myvar", myNS2), 3) |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
174 |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
175 %!error <NameError> |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
176 %! pyexec ("if 'myvar' in globals(): del myvar") |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
177 %! % Variable defined in local namespace MUST not be available globally |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
178 %! myNS = pyeval ("{}"); |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
179 %! pyexec ("myvar = 1.", myNS) |
307
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
180 %! pyeval ("myvar"); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
181 |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
182 %!error <NameError> |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
183 %! pyexec ("if 'myvar' in globals(): del myvar") |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
184 %! % Variable defined in one local namespace MUST not be available in another |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
185 %! myNS1 = pyeval ("{}"); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
186 %! myNS2 = pyeval ("{}"); |
327
15c20ab4b80a
Do not automatically convert Python integer types to Octave (see issue #56)
Mike Miller <mtmiller@octave.org>
parents:
316
diff
changeset
|
187 %! pyexec ("myvar = 1.", myNS1) |
307
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
188 %! pyeval ("myvar", myNS2); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
189 |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
190 %!error <NameError> |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
191 %! pyexec ("if 'sys' in globals(): del sys") |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
192 %! % Modules imported in local namespace MUST not be accessible globally |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
193 %! myNS = pyeval ("{}"); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
194 %! pyexec ("import sys", myNS); |
b4e56f7255f7
Add option to specify namespace when calling pyexec and pyeval (fixes issue #25)
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
279
diff
changeset
|
195 %! pyeval ("sys"); |
180
5f0d94afebe2
Added some basic tests
Abhinav Tripathi <genuinelucifer@gmail.com>
parents:
176
diff
changeset
|
196 */ |