Mercurial > pytave

changeset 366:5c900b8383c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pyobject.isa: work with a cell array of type names * @pyobject/pyobject.m (pyobject.isa): Accept a cell array of type names for compatibility with Octave's default isa function.
author Mike Miller <mtmiller@octave.org>
date Thu, 25 Aug 2016 14:57:29 -0700
parents 087e7bc3697f
children 9d7188514f2c
files @pyobject/pyobject.m
diffstat 1 files changed, 15 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/@pyobject/pyobject.m	Thu Aug 25 14:06:56 2016 -0700
+++ b/@pyobject/pyobject.m	Thu Aug 25 14:57:29 2016 -0700
@@ -119,12 +119,21 @@
 
     function y = isa (x, typestr)
       assert (nargin == 2);
-      assert (ischar (typestr));
-      if ((numel (typestr) > 3) && (typestr(1:3) == "py."))
-        y = __py_isinstance__ (x, typestr);
-      else
-        y = builtin ("isa", x, typestr);
+      assert (ischar (typestr) || iscellstr (typestr));
+
+      if (ischar (typestr))
+        typestr = { typestr };
       endif
+
+      y = false (size (typestr));
+
+      for i = 1:numel (typestr)
+        if ((numel (typestr{i}) > 3) && (typestr{i}(1:3) == "py."))
+          y(i) = __py_isinstance__ (x, typestr{i});
+        else
+          y(i) = builtin ("isa", x, typestr{i});
+        endif
+      endfor
     endfunction
 
     function y = struct (x)
@@ -346,6 +355,7 @@
 %!assert (isa (pyobject (struct ()), "py.dict"))
 %!assert (isa (pyobject (cell ()), "py.tuple"))
 %!assert (isa (pyobject ([1, 2, 3, 4]), "py.array.array"))
+%!assert (all (isa (pyobject (0), {"pyobject", "py.float", "py.numbers.Number"})))
 
 ## Test conversion method pyobject.int64
 %!assert (int64 (pyobject (int8 (0))), int64 (0))