remove returns_none

Author: jph00

fastcore/dispatch.py

@@ -75,7 +75,6 @@ def __repr__(self): return self.d.__repr__()
     def first(self): return first(self.d.values())
 
 # Cell
-@docs
 class TypeDispatch:
     "Dictionary-like object; `__getitem__` matches keys of types using `issubclass`"
     def __init__(self, funcs=(), bases=()):
@@ -94,11 +93,13 @@ def add(self, f):
             self.funcs.add(a0, t)
         t.add(a1, f)
 
-    def first(self): return self.funcs.first().first()
-    def returns(self, x): return anno_ret(self[type(x)])
-    def returns_none(self, x):
-        r = anno_ret(self[type(x)])
-        return None if r == NoneType else r
+    def first(self):
+        "Get first function in ordered dict of type:func."
+        return self.funcs.first().first()
+
+    def returns(self, x):
+        "Get the return type of annotation of `x`."
+        return anno_ret(self[type(x)])
 
     def _attname(self,k): return getattr(k,'__name__',str(k))
     def __repr__(self):
@@ -134,10 +135,6 @@ def __getitem__(self, k):
             if res is not None: return res
         return None
 
-    _docs = dict(first="Get first function in ordered dict of type:func.",
-                 returns="Get the return type of annotation of `x`.",
-                 returns_none="Returns `None` if return type annotation is `None` or `NoneType`.")
-
 # Cell
 class DispatchReg:
     "A global registry for `TypeDispatch` objects keyed by function name"

fastcore/transform.py

@@ -85,7 +85,7 @@ def _call(self, fn, x, split_idx=None, **kwargs):
     def _do_call(self, f, x, **kwargs):
         if not _is_tuple(x):
             if f is None: return x
-            ret = f.returns_none(x) if hasattr(f,'returns_none') else None
+            ret = f.returns(x) if hasattr(f,'returns') else None
             return retain_type(f(x, **kwargs), x, ret)
         res = tuple(self._do_call(f, x_, **kwargs) for x_ in x)
         return retain_type(res, x)

nbs/04_dispatch.ipynb

@@ -298,7 +298,6 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "@docs\n",
     "class TypeDispatch:\n",
     "    \"Dictionary-like object; `__getitem__` matches keys of types using `issubclass`\"\n",
     "    def __init__(self, funcs=(), bases=()):\n",
@@ -317,11 +316,13 @@
     "            self.funcs.add(a0, t)\n",
     "        t.add(a1, f)\n",
     "\n",
-    "    def first(self): return self.funcs.first().first()\n",
-    "    def returns(self, x): return anno_ret(self[type(x)])\n",
-    "    def returns_none(self, x):\n",
-    "        r = anno_ret(self[type(x)])\n",
-    "        return None if r == NoneType else r\n",
+    "    def first(self):\n",
+    "        \"Get first function in ordered dict of type:func.\"\n",
+    "        return self.funcs.first().first()\n",
+    "    \n",
+    "    def returns(self, x):\n",
+    "        \"Get the return type of annotation of `x`.\"\n",
+    "        return anno_ret(self[type(x)])\n",
     "\n",
     "    def _attname(self,k): return getattr(k,'__name__',str(k))\n",
     "    def __repr__(self):\n",
@@ -355,36 +356,7 @@
     "        for base in self.bases:\n",
     "            res = base[k]\n",
     "            if res is not None: return res\n",
-    "        return None\n",
-    "    \n",
-    "    _docs = dict(first=\"Get first function in ordered dict of type:func.\",\n",
-    "                 returns=\"Get the return type of annotation of `x`.\",\n",
-    "                 returns_none=\"Returns `None` if return type annotation is `None` or `NoneType`.\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "<function __main__.a(z: type)>"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "def a(z:type): return 'a'\n",
-    "def b(z:object): return 'b'\n",
-    "\n",
-    "t = TypeDispatch([a,b])\n",
-    "\n",
-    "t[TypeDispatch]"
+    "        return None"
    ]
   },
   {
@@ -507,7 +479,7 @@
     {
      "data": {
       "text/markdown": [
-       "<h4 id=\"TypeDispatch.add\" class=\"doc_header\"><code>TypeDispatch.add</code><a href=\"__main__.py#L11\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
+       "<h4 id=\"TypeDispatch.add\" class=\"doc_header\"><code>TypeDispatch.add</code><a href=\"__main__.py#L10\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
        "\n",
        "> <code>TypeDispatch.add</code>(**`f`**)\n",
        "\n",
@@ -830,7 +802,7 @@
     {
      "data": {
       "text/markdown": [
-       "<h4 id=\"TypeDispatch.__call__\" class=\"doc_header\"><code>TypeDispatch.__call__</code><a href=\"__main__.py#L34\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
+       "<h4 id=\"TypeDispatch.__call__\" class=\"doc_header\"><code>TypeDispatch.__call__</code><a href=\"__main__.py#L35\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
        "\n",
        "> <code>TypeDispatch.__call__</code>(**\\*`args`**, **\\*\\*`kwargs`**)\n",
        "\n",
@@ -918,7 +890,7 @@
     {
      "data": {
       "text/markdown": [
-       "<h4 id=\"TypeDispatch.returns\" class=\"doc_header\"><code>TypeDispatch.returns</code><a href=\"__main__.py#L22\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
+       "<h4 id=\"TypeDispatch.returns\" class=\"doc_header\"><code>TypeDispatch.returns</code><a href=\"__main__.py#L24\" class=\"source_link\" style=\"float:right\">[source]</a></h4>\n",
        "\n",
        "> <code>TypeDispatch.returns</code>(**`x`**)\n",
        "\n",