fixes #191

Author: jph00

fastcore/basics.py

@@ -143,7 +143,10 @@ def exec_local(code, var_name):
 # Cell
 def risinstance(types, obj=None):
     "Curried `isinstance` but with args reversed"
+    types = tuplify(types)
     if obj is None: return partial(risinstance,types)
+    if any(isinstance(t,str) for t in types):
+        return any(t.__name__ in types for t in type(obj).__mro__)
     return isinstance(obj, types)
 
 # Cell

fastcore/dispatch.py

@@ -174,7 +174,7 @@ def default_set_meta(self, x, as_copy=False):
 def cast(x, typ):
     "cast `x` to type `typ` (may also change `x` inplace)"
     res = typ._before_cast(x) if hasattr(typ, '_before_cast') else x
-    if isinstance_str(res, 'ndarray'): res = res.view(typ)
+    if risinstance('ndarray', res): res = res.view(typ)
     elif hasattr(res, 'as_subclass'): res = res.as_subclass(typ)
     else:
         try: res.__class__ = typ

fastcore/foundation.py

@@ -50,7 +50,7 @@ def coll_repr(c, max_n=10):
 # Cell
 def is_bool(x):
     "Check whether `x` is a bool or None"
-    return isinstance(x,(bool,NoneType)) or isinstance_str(x, 'bool_')
+    return isinstance(x,(bool,NoneType)) or risinstance('bool_', x)
 
 # Cell
 def mask2idxs(mask):
@@ -127,7 +127,7 @@ def __setitem__(self, idx, o):
             for i,o_ in zip(idx,o): self.items[i] = o_
 
     def __eq__(self,b):
-        if isinstance_str(b, 'ndarray'): return array_equal(b, self)
+        if risinstance('ndarray', b): return array_equal(b, self)
         if isinstance(b, (str,dict)): return False
         return all_equal(b,self)
 

nbs/01_basics.ipynb

@@ -747,7 +747,10 @@
     "#export\n",
     "def risinstance(types, obj=None):\n",
     "    \"Curried `isinstance` but with args reversed\"\n",
+    "    types = tuplify(types)\n",
     "    if obj is None: return partial(risinstance,types)\n",
+    "    if any(isinstance(t,str) for t in types):\n",
+    "        return any(t.__name__ in types for t in type(obj).__mro__)\n",
     "    return isinstance(obj, types)"
    ]
   },
@@ -762,6 +765,24 @@
     "assert risinstance(int)(1)"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "`types` can also be strings:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert risinstance(('str','int'), 'a')\n",
+    "assert risinstance('str', 'a')\n",
+    "assert not risinstance('int', 'a')"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},

nbs/02_foundation.ipynb

@@ -347,7 +347,7 @@
     "# export\n",
     "def is_bool(x):\n",
     "    \"Check whether `x` is a bool or None\"\n",
-    "    return isinstance(x,(bool,NoneType)) or isinstance_str(x, 'bool_')"
+    "    return isinstance(x,(bool,NoneType)) or risinstance('bool_', x)"
    ]
   },
   {
@@ -576,7 +576,7 @@
     "            for i,o_ in zip(idx,o): self.items[i] = o_\n",
     "\n",
     "    def __eq__(self,b): \n",
-    "        if isinstance_str(b, 'ndarray'): return array_equal(b, self)\n",
+    "        if risinstance('ndarray', b): return array_equal(b, self)\n",
     "        if isinstance(b, (str,dict)): return False\n",
     "        return all_equal(b,self)\n",
     "\n",
@@ -685,7 +685,7 @@
     {
      "data": {
       "text/plain": [
-       "b'\\x80\\x04\\x95\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x8c\\x07inspect\\x94\\x8c\\tSignature\\x94\\x93\\x94(h\\x00\\x8c\\tParameter\\x94\\x93\\x94\\x8c\\x05items\\x94h\\x00\\x8c\\x0e_ParameterKind\\x94\\x93\\x94K\\x01\\x85\\x94R\\x94\\x86\\x94R\\x94}\\x94(\\x8c\\x08_default\\x94N\\x8c\\x0b_annotation\\x94h\\x00\\x8c\\x06_empty\\x94\\x93\\x94ubh\\x04\\x8c\\x04rest\\x94h\\x07K\\x02\\x85\\x94R\\x94\\x86\\x94R\\x94}\\x94(h\\rh\\x10h\\x0eh\\x10ubh\\x04\\x8c\\x08use_list\\x94h\\x07K\\x03\\x85\\x94R\\x94\\x86\\x94R\\x94}\\x94(h\\r\\x89h\\x0eh\\x10ubh\\x04\\x8c\\x05match\\x94h\\x19\\x86\\x94R\\x94}\\x94(h\\rNh\\x0eh\\x10ubt\\x94\\x85\\x94R\\x94}\\x94\\x8c\\x12_return_annotation\\x94h\\x10sb.'"
+       "b'\\x80\\x03cinspect\\nSignature\\nq\\x00(cinspect\\nParameter\\nq\\x01X\\x05\\x00\\x00\\x00itemsq\\x02cinspect\\n_ParameterKind\\nq\\x03K\\x01\\x85q\\x04Rq\\x05\\x86q\\x06Rq\\x07}q\\x08(X\\x08\\x00\\x00\\x00_defaultq\\tNX\\x0b\\x00\\x00\\x00_annotationq\\ncinspect\\n_empty\\nq\\x0bubh\\x01X\\x04\\x00\\x00\\x00restq\\x0ch\\x03K\\x02\\x85q\\rRq\\x0e\\x86q\\x0fRq\\x10}q\\x11(h\\th\\x0bh\\nh\\x0bubh\\x01X\\x08\\x00\\x00\\x00use_listq\\x12h\\x03K\\x03\\x85q\\x13Rq\\x14\\x86q\\x15Rq\\x16}q\\x17(h\\t\\x89h\\nh\\x0bubh\\x01X\\x05\\x00\\x00\\x00matchq\\x18h\\x14\\x86q\\x19Rq\\x1a}q\\x1b(h\\tNh\\nh\\x0bubtq\\x1c\\x85q\\x1dRq\\x1e}q\\x1fX\\x12\\x00\\x00\\x00_return_annotationq h\\x0bsb.'"
       ]
      },
      "execution_count": null,
@@ -818,7 +818,7 @@
     {
      "data": {
       "text/plain": [
-       "[10, 3, 7]"
+       "['j', 5, 10]"
       ]
      },
      "execution_count": null,
@@ -1991,7 +1991,6 @@
       "Converted 05_transform.ipynb.\n",
       "Converted 07_meta.ipynb.\n",
       "Converted 08_script.ipynb.\n",
-      "Converted Untitled1.ipynb.\n",
       "Converted index.ipynb.\n"
      ]
     }

nbs/04_dispatch.ipynb

@@ -1210,7 +1210,7 @@
     "def cast(x, typ):\n",
     "    \"cast `x` to type `typ` (may also change `x` inplace)\"\n",
     "    res = typ._before_cast(x) if hasattr(typ, '_before_cast') else x\n",
-    "    if isinstance_str(res, 'ndarray'): res = res.view(typ)\n",
+    "    if risinstance('ndarray', res): res = res.view(typ)\n",
     "    elif hasattr(res, 'as_subclass'): res = res.as_subclass(typ)\n",
     "    else:\n",
     "        try: res.__class__ = typ\n",
@@ -1412,9 +1412,10 @@
       "Converted 01_basics.ipynb.\n",
       "Converted 02_foundation.ipynb.\n",
       "Converted 03_xtras.ipynb.\n",
+      "Converted 03a_parallel.ipynb.\n",
+      "Converted 03b_net.ipynb.\n",
       "Converted 04_dispatch.ipynb.\n",
       "Converted 05_transform.ipynb.\n",
-      "Converted 06_logargs.ipynb.\n",
       "Converted 07_meta.ipynb.\n",
       "Converted 08_script.ipynb.\n",
       "Converted index.ipynb.\n"