fixes #789

Author: jph00

fastcore/basics.py

@@ -1098,7 +1098,7 @@ def __init__(self, f): self.f = f
     def __get__(self, _, f_cls): return MethodType(self.f, f_cls)
 
 # %% ../nbs/01_basics.ipynb #3f2733ef
-def patch_to(cls, as_prop=False, cls_method=False, set_prop=False, nm=None, glb=None, once:bool=False):
+def patch_to(cls, as_prop=False, cls_method=False, set_prop=False, nm=None, glb=None):
     "Decorator: add `f` to `cls`"
     if glb is None: glb = sys._getframe(1).f_globals
     def _inner(f):
@@ -1113,17 +1113,16 @@ def _inner(f):
             elif set_prop:    attr = getattr(c_, _nm).setter(nf)
             elif as_prop:     attr = property(nf)
             else:
-                if hasattr(c_, onm) and once: break
-                if hasattr(c_, _nm): setattr(c_, onm, getattr(c_, _nm))
+                if hasattr(c_, _nm) and not hasattr(c_, onm): setattr(c_, onm, getattr(c_, _nm))
                 attr = nf
             setattr(c_, _nm, attr)
         return glb.get(_nm, builtins.__dict__.get(_nm, None))
     return _inner
 
 # %% ../nbs/01_basics.ipynb #8faf7b86
-def patch(f=None, *, as_prop=False, cls_method=False, set_prop=False, nm=None, once:bool=False):
+def patch(f=None, *, as_prop=False, cls_method=False, set_prop=False, nm=None):
     "Decorator: add `f` to the first parameter's class (based on f's type annotations)"
-    if f is None: return partial(patch, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm, once=once)
+    if f is None: return partial(patch, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm)
     ann,glb,loc = get_annotations_ex(f)
     if cls_method:
         if 'cls' not in ann: raise TypeError(f"@patch with cls_method=True requires 'cls' to have a type annotation")
@@ -1132,7 +1131,7 @@ def patch(f=None, *, as_prop=False, cls_method=False, set_prop=False, nm=None, o
         if not ann: raise TypeError(f"@patch requires the first parameter of `{f.__name__}` to have a type annotation")
         cls = next(iter(ann.values()))
     cls = union2tuple(eval_type(cls, glb, loc))
-    return patch_to(cls, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm, once=once, glb=sys._getframe(1).f_globals)(f)
+    return patch_to(cls, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm, glb=sys._getframe(1).f_globals)(f)
 
 # %% ../nbs/01_basics.ipynb #d1732261
 def compile_re(pat):

nbs/01_basics.ipynb

@@ -6509,7 +6509,7 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def patch_to(cls, as_prop=False, cls_method=False, set_prop=False, nm=None, glb=None, once:bool=False):\n",
+    "def patch_to(cls, as_prop=False, cls_method=False, set_prop=False, nm=None, glb=None):\n",
     "    \"Decorator: add `f` to `cls`\"\n",
     "    if glb is None: glb = sys._getframe(1).f_globals\n",
     "    def _inner(f):\n",
@@ -6524,8 +6524,7 @@
     "            elif set_prop:    attr = getattr(c_, _nm).setter(nf)\n",
     "            elif as_prop:     attr = property(nf)\n",
     "            else:\n",
-    "                if hasattr(c_, onm) and once: break\n",
-    "                if hasattr(c_, _nm): setattr(c_, onm, getattr(c_, _nm))\n",
+    "                if hasattr(c_, _nm) and not hasattr(c_, onm): setattr(c_, onm, getattr(c_, _nm))\n",
     "                attr = nf\n",
     "            setattr(c_, _nm, attr)\n",
     "        return glb.get(_nm, builtins.__dict__.get(_nm, None))\n",
@@ -6718,9 +6717,9 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def patch(f=None, *, as_prop=False, cls_method=False, set_prop=False, nm=None, once:bool=False):\n",
+    "def patch(f=None, *, as_prop=False, cls_method=False, set_prop=False, nm=None):\n",
     "    \"Decorator: add `f` to the first parameter's class (based on f's type annotations)\"\n",
-    "    if f is None: return partial(patch, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm, once=once)\n",
+    "    if f is None: return partial(patch, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm)\n",
     "    ann,glb,loc = get_annotations_ex(f)\n",
     "    if cls_method:\n",
     "        if 'cls' not in ann: raise TypeError(f\"@patch with cls_method=True requires 'cls' to have a type annotation\")\n",
@@ -6729,7 +6728,7 @@
     "        if not ann: raise TypeError(f\"@patch requires the first parameter of `{f.__name__}` to have a type annotation\")\n",
     "        cls = next(iter(ann.values()))\n",
     "    cls = union2tuple(eval_type(cls, glb, loc))\n",
-    "    return patch_to(cls, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm, once=once, glb=sys._getframe(1).f_globals)(f)"
+    "    return patch_to(cls, as_prop=as_prop, cls_method=cls_method, set_prop=set_prop, nm=nm, glb=sys._getframe(1).f_globals)(f)"
    ]
   },
   {