fixes #558

Author: jph00

fastcore/basics.py

@@ -20,7 +20,7 @@
 
 # %% ../nbs/01_basics.ipynb 1
 from .imports import *
-import builtins,types
+import builtins,types,typing
 import pprint
 try: from types import UnionType
 except ImportError: UnionType = None
@@ -975,10 +975,13 @@ def _inner(f):
             # `functools.update_wrapper` when passing patched function to `Pipeline`, so we do it manually
             for o in functools.WRAPPER_ASSIGNMENTS: setattr(nf, o, getattr(f,o))
             nf.__qualname__ = f"{c_.__name__}.{nm}"
-            if cls_method:
-                setattr(c_, nm, _clsmethod(nf))
+            if cls_method: setattr(c_, nm, _clsmethod(nf))
             else:
-                setattr(c_, nm, property(nf) if as_prop else nf)
+                if as_prop: setattr(c_, nm, property(nf))
+                else:
+                    onm = '_orig_'+nm
+                    if hasattr(c_, nm) and not hasattr(c_, onm): setattr(c_, onm, getattr(c_, nm))
+                    setattr(c_, nm, nf)
         # Avoid clobbering existing functions
         return globals().get(nm, builtins.__dict__.get(nm, None))
     return _inner

nbs/01_basics.ipynb

@@ -17,7 +17,7 @@
    "source": [
     "#|export\n",
     "from fastcore.imports import *\n",
-    "import builtins,types\n",
+    "import builtins,types,typing\n",
     "import pprint\n",
     "try: from types import UnionType\n",
     "except ImportError: UnionType = None"
@@ -4263,7 +4263,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L784){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L792){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### fastuple\n",
        "\n",
@@ -4274,7 +4274,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L784){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L792){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "#### fastuple\n",
        "\n",
@@ -4348,7 +4348,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L803){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L811){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "##### fastuple.add\n",
        "\n",
@@ -4359,7 +4359,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L803){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L811){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "##### fastuple.add\n",
        "\n",
@@ -4398,7 +4398,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L799){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L807){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "##### fastuple.mul\n",
        "\n",
@@ -4409,7 +4409,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L799){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L807){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "##### fastuple.mul\n",
        "\n",
@@ -4559,7 +4559,7 @@
       "text/markdown": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L830){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L838){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "### bind\n",
        "\n",
@@ -4570,7 +4570,7 @@
       "text/plain": [
        "---\n",
        "\n",
-       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L830){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
+       "[source](https://github.com/fastai/fastcore/blob/master/fastcore/basics.py#L838){target=\"_blank\" style=\"float:right; font-size:smaller\"}\n",
        "\n",
        "### bind\n",
        "\n",
@@ -5218,10 +5218,13 @@
     "            # `functools.update_wrapper` when passing patched function to `Pipeline`, so we do it manually\n",
     "            for o in functools.WRAPPER_ASSIGNMENTS: setattr(nf, o, getattr(f,o))\n",
     "            nf.__qualname__ = f\"{c_.__name__}.{nm}\"\n",
-    "            if cls_method:\n",
-    "                setattr(c_, nm, _clsmethod(nf))\n",
+    "            if cls_method: setattr(c_, nm, _clsmethod(nf))\n",
     "            else:\n",
-    "                setattr(c_, nm, property(nf) if as_prop else nf)\n",
+    "                if as_prop: setattr(c_, nm, property(nf))\n",
+    "                else:\n",
+    "                    onm = '_orig_'+nm\n",
+    "                    if hasattr(c_, nm) and not hasattr(c_, onm): setattr(c_, onm, getattr(c_, nm))\n",
+    "                    setattr(c_, nm, nf)\n",
     "        # Avoid clobbering existing functions\n",
     "        return globals().get(nm, builtins.__dict__.get(nm, None))\n",
     "    return _inner"