Mercurial > pytave
annotate __py_struct_from_dict__.cc @ 373:0e4097c66788
Report a Python object's fully qualified class name correctly
* oct-py-util.cc (pytave::py_object_class_name): Return the correct fully
qualified class name, including module prefix.
(pytave::is_py_kwargs_argument): Check for class name "__main__._OctaveKwargs".
* __py_struct_from_dict__.cc (F__py_class_name__): New function.
* @pyobject/methods.m (pyobject.methods): Use __py_class_name__.
* @pyobject/pyobject.m (pyobject.class): Likewise.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Fri, 26 Aug 2016 14:05:37 -0700 |
parents | 4d54fb68de71 |
children | d362cdd1ddeb |
rev | line source |
---|---|
345
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
1 /* |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
2 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
3 Copyright (C) 2016 Mike Miller |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
4 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
5 This file is part of Pytave. |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
6 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
7 Pytave is free software: you can redistribute it and/or modify it |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
8 under the terms of the GNU General Public License as published by the |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
10 option) any later version. |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
11 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
12 Pytave is distributed in the hope that it will be useful, but WITHOUT |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
15 for more details. |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
16 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
18 along with Pytave; see the file COPYING. If not, see |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
19 <http://www.gnu.org/licenses/>. |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
20 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
21 */ |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
22 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
23 #if defined (HAVE_CONFIG_H) |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
24 # include <config.h> |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
25 #endif |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
26 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
27 #include <Python.h> |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
28 #include <octave/oct.h> |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
29 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
30 #define PYTAVE_DO_DECLARE_SYMBOL |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
31 #include "arrayobjectdefs.h" |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
32 #include "exceptions.h" |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
33 #include "oct-py-types.h" |
358
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
34 #include "oct-py-util.h" |
345
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
35 #include "octave_to_python.h" |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
36 |
373
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
37 DEFUN_DLD (__py_class_name__, args, , |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
38 "-*- texinfo -*-\n\ |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
39 @deftypefn {} {} __py_class_name__ (@var{obj})\n\ |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
40 Return the name of the class of the Python object @var{obj}.\n\ |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
41 \n\ |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
42 This is a private internal function not intended for direct use.\n\ |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
43 @end deftypefn") |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
44 { |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
45 if (args.length () != 1) |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
46 print_usage (); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
47 |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
48 if (! (args(0).is_object () && args(0).class_name () == "pyobject")) |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
49 error ("__py_class_name__: argument must be a valid Python object"); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
50 |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
51 Py_Initialize (); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
52 |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
53 PyObject *obj = pytave::pyobject_unwrap_object (args(0)); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
54 std::string name = pytave::py_object_class_name (obj); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
55 Py_DECREF (obj); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
56 |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
57 return ovl (name); |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
58 } |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
59 |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
60 /* |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
61 %!assert (__py_class_name__ (pyeval ("None")), "NoneType") |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
62 %!assert (__py_class_name__ (pyeval ("0")), "int") |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
63 %!assert (__py_class_name__ (pyeval ("'Octave'")), "str") |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
64 %!assert (__py_class_name__ (pyeval ("[]")), "list") |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
65 %!assert (__py_class_name__ (pyeval ("__import__('array').array('d')")), "array.array") |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
66 |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
67 %!error __py_class_name__ () |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
68 %!error __py_class_name__ (1) |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
69 %!error __py_class_name__ (1, 2) |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
70 */ |
0e4097c66788
Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents:
368
diff
changeset
|
71 |
356
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
72 DEFUN_DLD (__py_int64_scalar_value__, args, nargout, |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
73 "-*- texinfo -*-\n\ |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
74 @deftypefn {} {} __py_int64_scalar_value__ (@var{x})\n\ |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
75 Extract a scalar int64 value from the Python integer @var{x}.\n\ |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
76 \n\ |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
77 This is a private internal function not intended for direct use.\n\ |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
78 @end deftypefn") |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
79 { |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
80 octave_value_list retval; |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
81 |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
82 int nargin = args.length (); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
83 if (nargin != 1) |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
84 { |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
85 print_usage (); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
86 return retval; |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
87 } |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
88 |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
89 if (! (args(0).is_object () && args(0).class_name () == "pyobject")) |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
90 error ("pyobject.int64: argument must be a Python object"); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
91 |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
92 Py_Initialize (); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
93 |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
94 try |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
95 { |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
96 // FIXME: PyObject *obj = look up stored pyobject reference (args(0)); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
97 boost::python::object arg; |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
98 pytave::octvalue_to_pyobj (arg, args(0)); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
99 PyObject *obj = arg.ptr (); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
100 |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
101 retval(0) = octave_int64 (pytave::extract_py_int64 (obj)); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
102 } |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
103 catch (pytave::object_convert_exception const &) |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
104 { |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
105 error ("pyobject.int64: error in return value type conversion"); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
106 } |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
107 catch (boost::python::error_already_set const &) |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
108 { |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
109 std::string message = pytave::fetch_exception_message (); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
110 error ("pyobject.int64: %s", message.c_str ()); |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
111 } |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
112 |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
113 return retval; |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
114 } |
6cd581661176
pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents:
345
diff
changeset
|
115 |
368
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
116 DEFUN_DLD (__py_is_none__, args, nargout, |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
117 "-*- texinfo -*-\n\ |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
118 @deftypefn {} {} __py_is_none__ (@var{x})\n\ |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
119 Check whether the Python object @var{obj} is the @code{None} object.\n\ |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
120 \n\ |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
121 This is a private internal function not intended for direct use.\n\ |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
122 @end deftypefn") |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
123 { |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
124 if (args.length () != 1) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
125 print_usage (); |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
126 |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
127 Py_Initialize (); |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
128 |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
129 PyObject *obj = pytave::pyobject_unwrap_object (args(0)); |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
130 |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
131 bool retval = (obj && (obj == Py_None)); |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
132 Py_XDECREF (obj); |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
133 |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
134 return ovl (retval); |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
135 } |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
136 |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
137 /* |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
138 %!assert (__py_is_none__ (pyobject ())) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
139 %!assert (__py_is_none__ (pyeval ("None"))) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
140 %!assert (! __py_is_none__ (1)) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
141 %!assert (! __py_is_none__ ("None")) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
142 %!assert (! __py_is_none__ (pyobject (1))) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
143 %!assert (! __py_is_none__ (pyobject ("None"))) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
144 |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
145 %!error __py_is_none__ () |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
146 %!error __py_is_none__ (1, 2) |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
147 */ |
4d54fb68de71
__py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents:
365
diff
changeset
|
148 |
358
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
149 DEFUN_DLD (__py_isinstance__, args, nargout, |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
150 "-*- texinfo -*-\n\ |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
151 @deftypefn {} {} __py_isinstance__ (@var{x})\n\ |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
152 Check whether the Python object @var{obj} is an instance of a Python type\n\ |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
153 specified by the string @var{type}.\n\ |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
154 \n\ |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
155 This is a private internal function not intended for direct use.\n\ |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
156 @end deftypefn") |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
157 { |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
158 octave_value_list retval; |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
159 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
160 int nargin = args.length (); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
161 if (nargin != 2) |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
162 { |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
163 print_usage (); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
164 return retval; |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
165 } |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
166 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
167 if (! (args(0).is_object () && args(0).class_name () == "pyobject")) |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
168 error ("pyobject.isa: OBJ must be a Python object"); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
169 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
170 if (! args(1).is_string ()) |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
171 error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)"); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
172 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
173 std::string typestr = args(1).string_value (); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
174 if (! ((typestr.size () > 3) && (typestr.compare (0, 3, "py.") == 0))) |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
175 error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)"); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
176 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
177 typestr = typestr.substr (3); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
178 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
179 Py_Initialize (); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
180 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
181 try |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
182 { |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
183 // FIXME: PyObject *obj = look up stored pyobject reference (args(0)); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
184 boost::python::object arg; |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
185 pytave::octvalue_to_pyobj (arg, args(0)); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
186 PyObject *obj = arg.ptr (); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
187 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
188 PyObject *type = pytave::py_find_type (typestr); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
189 retval(0) = pytave::py_isinstance (obj, type); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
190 Py_XDECREF (type); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
191 } |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
192 catch (pytave::object_convert_exception const &) |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
193 { |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
194 error ("pyobject.isa: error in return value type conversion"); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
195 } |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
196 catch (boost::python::error_already_set const &) |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
197 { |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
198 std::string message = pytave::fetch_exception_message (); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
199 error ("pyobject.isa: %s", message.c_str ()); |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
200 } |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
201 |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
202 return retval; |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
203 } |
d41fc23d4b9f
pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents:
356
diff
changeset
|
204 |
362
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
205 DEFUN_DLD (__py_objstore_del__, args, nargout, |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
206 "-*- texinfo -*-\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
207 @deftypefn {} {} __py_objstore_del__ (@var{key})\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
208 Delete the Python object stored under @var{key} from the object store.\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
209 \n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
210 This is a private internal function not intended for direct use.\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
211 @end deftypefn") |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
212 { |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
213 if (args.length () != 1) |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
214 print_usage (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
215 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
216 Py_Initialize (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
217 uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_del__: KEY must be an integer"); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
218 pytave::py_objstore_del (key); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
219 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
220 return ovl (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
221 } |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
222 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
223 DEFUN_DLD (__py_objstore_get__, args, nargout, |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
224 "-*- texinfo -*-\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
225 @deftypefn {} {} __py_objstore_get__ (@var{key})\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
226 Get the Python object stored under @var{key} from the object store.\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
227 \n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
228 This is a private internal function not intended for direct use.\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
229 @end deftypefn") |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
230 { |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
231 if (args.length () != 1) |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
232 print_usage (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
233 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
234 Py_Initialize (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
235 uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_get__: KEY must be an integer"); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
236 PyObject *obj = pytave::py_objstore_get (key); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
237 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
238 if (! obj) |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
239 error ("__py_objstore_get__: no existing Python object found for key %ju", key); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
240 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
241 octave_value retval = pytave::pyobject_wrap_object (obj); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
242 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
243 return ovl (retval); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
244 } |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
245 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
246 DEFUN_DLD (__py_objstore_put__, args, nargout, |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
247 "-*- texinfo -*-\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
248 @deftypefn {} {} __py_objstore_put__ (@var{value})\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
249 Convert @var{value} to a Python value and store in the object store.\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
250 \n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
251 This is a private internal function not intended for direct use.\n\ |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
252 @end deftypefn") |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
253 { |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
254 if (args.length () != 1) |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
255 print_usage (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
256 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
257 Py_Initialize (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
258 boost::python::numeric::array::set_module_and_type ("numpy", "ndarray"); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
259 _import_array (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
260 // FIXME: PyObject *obj = convert argument to Python (args(0)); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
261 PyObject *obj = 0; |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
262 try |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
263 { |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
264 boost::python::object arg; |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
265 pytave::octvalue_to_pyobj (arg, args(0)); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
266 obj = arg.ptr (); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
267 Py_INCREF (obj); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
268 } |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
269 catch (pytave::value_convert_exception const &) |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
270 { |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
271 } |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
272 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
273 if (! obj) |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
274 error ("__py_objstore_put__: VALUE must be convertible to a Python value"); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
275 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
276 uint64_t key = pytave::py_objstore_put (obj); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
277 Py_DECREF (obj); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
278 |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
279 return ovl (octave_uint64 (key)); |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
280 } |
b0677c492655
Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents:
358
diff
changeset
|
281 |
365
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
282 DEFUN_DLD (__py_string_value__, args, nargout, |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
283 "-*- texinfo -*-\n\ |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
284 @deftypefn {} {} __py_string_value__ (@var{obj})\n\ |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
285 Return the string value or representation of the Python object @var{obj}.\n\ |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
286 \n\ |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
287 This is a private internal function not intended for direct use.\n\ |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
288 @end deftypefn") |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
289 { |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
290 if (args.length () != 1) |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
291 print_usage (); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
292 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
293 if (! (args(0).is_object () && args(0).class_name () == "pyobject")) |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
294 error ("pyobject.char: argument must be a valid Python object"); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
295 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
296 Py_Initialize (); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
297 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
298 PyObject *obj = pytave::pyobject_unwrap_object (args(0)); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
299 if (! obj) |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
300 error ("pyobject.char: argument must be a valid Python object"); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
301 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
302 std::string str; |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
303 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
304 if (PyBytes_Check (obj) || PyUnicode_Check (obj)) |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
305 str = pytave::extract_py_str (obj); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
306 else if (Py_TYPE (obj)->tp_str != NULL) |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
307 { |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
308 PyObject *s = PyObject_Str (obj); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
309 str = pytave::extract_py_str (s); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
310 Py_DECREF (s); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
311 } |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
312 else |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
313 { |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
314 Py_DECREF (obj); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
315 error ("pyobject.char: cannot convert Python object to string"); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
316 } |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
317 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
318 Py_DECREF (obj); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
319 |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
320 return ovl (str); |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
321 } |
087e7bc3697f
Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents:
362
diff
changeset
|
322 |
345
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
323 DEFUN_DLD (__py_struct_from_dict__, args, nargout, |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
324 "-*- texinfo -*-\n\ |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
325 @deftypefn {} {} __py_struct_from_dict__ (@var{dict})\n\ |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
326 Extract a scalar struct from the Python dict @var{dict}.\n\ |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
327 \n\ |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
328 This is a private internal function not intended for direct use.\n\ |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
329 @end deftypefn") |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
330 { |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
331 octave_value_list retval; |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
332 std::string id; |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
333 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
334 int nargin = args.length (); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
335 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
336 if (nargin != 1) |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
337 { |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
338 print_usage (); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
339 return retval; |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
340 } |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
341 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
342 if (! (args(0).is_object () && args(0).class_name () == "pyobject")) |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
343 error ("pyobject.struct: argument must be a Python object"); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
344 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
345 Py_Initialize (); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
346 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
347 try |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
348 { |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
349 // FIXME: PyObject *obj = look up stored pyobject reference (args(0)); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
350 boost::python::object arg; |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
351 pytave::octvalue_to_pyobj (arg, args(0)); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
352 PyObject *obj = arg.ptr (); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
353 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
354 retval(0) = pytave::extract_py_scalar_map (obj); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
355 } |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
356 catch (pytave::object_convert_exception const &) |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
357 { |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
358 error ("pyobject.struct: error in return value type conversion"); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
359 } |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
360 catch (boost::python::error_already_set const &) |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
361 { |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
362 std::string message = pytave::fetch_exception_message (); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
363 error ("pyobject.struct: %s", message.c_str ()); |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
364 } |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
365 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
366 return retval; |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
367 } |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
368 |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
369 /* |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
370 ## No test needed for internal helper function. |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
371 %!assert (1) |
baff3b90dcb1
__py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff
changeset
|
372 */ |