Mercurial > pytave
changeset 276:e4175c38b012
py: handle calling builtin functions with "py.foo" syntax (fixes issue #43)
* @py/subsref.m: Attempt to evaluate name as a builtin function or type
before attempting to import it as a module.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Fri, 29 Jul 2016 14:51:24 -0700 |
| parents | 24faaa3cf5e5 |
| children | 3bdd924a5fc7 |
| files | @py/subsref.m |
| diffstat | 1 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/@py/subsref.m Fri Jul 29 14:39:27 2016 -0700 +++ b/@py/subsref.m Fri Jul 29 14:51:24 2016 -0700 @@ -42,7 +42,15 @@ error ("py: invalid indexing type"); endif - y = pycall ("__import__", subs); + if (type == "." && ((numel (idx) == 1) || (idx(2).type != "."))) + try + y = pyeval (subs); + catch + y = pycall ("__import__", subs); + end_try_catch + else + y = pycall ("__import__", subs); + endif if (numel (idx) > 1) y = subsref (y, idx(2:end));