minor cleanup

Author: seeM

fastcore/transform.py

@@ -39,9 +39,6 @@ def __setitem__(self,k,v):
 
 # Cell
 class _TfmMeta(type):
-    @classmethod
-    def __prepare__(cls, name, bases): return _TfmDict()
-
     def __new__(cls, name, bases, dict):
         res = super().__new__(cls, name, bases, dict)
         res.__signature__ = inspect.signature(res.__init__)
@@ -50,10 +47,16 @@ def __new__(cls, name, bases, dict):
     def __call__(cls, *args, **kwargs):
         f = first(args)
         n = getattr(f,'__name__',None)
-        if not _is_tfm_method(f,n): return super().__call__(*args,**kwargs)
+        if _is_tfm_method(f,n):
+            if n in cls.__dict__: return getattr(cls,n).dispatch(f)
+
+            return super().__call__(*args,**kwargs)
         if n in cls.__dict__: getattr(cls,n).dispatch(f)
         return _mk_plum_func(dispatch,n,f,cls=cls)
 
+    @classmethod
+    def __prepare__(cls, name, bases): return _TfmDict()
+
 # Cell
 def _get_name(o):
     if hasattr(o,'__qualname__'): return o.__qualname__
@@ -76,11 +79,11 @@ def __init__(self, enc=None, dec=None, split_idx=None, order=None):
         self._d = Dispatcher() # TODO: do we need to hold this reference?
         for n in _tfm_methods: setattr(self,n,_mk_plum_func(self._d,n))
         if enc:
-            self.encodes = self.encodes.dispatch(enc)
+            self.encodes.dispatch(enc)
             self.order = getattr(enc,'order',self.order)
             if len(type_hints(enc)) > 0: self.input_types = first(type_hints(enc).values())
             self._name = _get_name(enc)
-        if dec: self.decodes = self.decodes.dispatch(dec)
+        if dec: self.decodes.dispatch(dec)
 
     @property
     def name(self): return getattr(self, '_name', _get_name(self))

nbs/05_transform.ipynb

@@ -108,9 +108,6 @@
    "source": [
     "#export\n",
     "class _TfmMeta(type):\n",
-    "    @classmethod\n",
-    "    def __prepare__(cls, name, bases): return _TfmDict()\n",
-    "\n",
     "    def __new__(cls, name, bases, dict):\n",
     "        res = super().__new__(cls, name, bases, dict)\n",
     "        res.__signature__ = inspect.signature(res.__init__)\n",
@@ -119,9 +116,13 @@
     "    def __call__(cls, *args, **kwargs):\n",
     "        f = first(args)\n",
     "        n = getattr(f,'__name__',None)\n",
-    "        if not _is_tfm_method(f,n): return super().__call__(*args,**kwargs)\n",
-    "        if n in cls.__dict__: getattr(cls,n).dispatch(f)\n",
-    "        return _mk_plum_func(dispatch,n,f,cls=cls)"
+    "        if _is_tfm_method(f,n):\n",
+    "            if n in cls.__dict__: return getattr(cls,n).dispatch(f)\n",
+    "            return _mk_plum_func(dispatch,n,f,cls=cls)\n",
+    "        return super().__call__(*args,**kwargs)\n",
+    "\n",
+    "    @classmethod\n",
+    "    def __prepare__(cls, name, bases): return _TfmDict()"
    ]
   },
   {
@@ -166,11 +167,11 @@
     "        self._d = Dispatcher() # TODO: do we need to hold this reference?\n",
     "        for n in _tfm_methods: setattr(self,n,_mk_plum_func(self._d,n))\n",
     "        if enc:\n",
-    "            self.encodes = self.encodes.dispatch(enc)\n",
+    "            self.encodes.dispatch(enc)\n",
     "            self.order = getattr(enc,'order',self.order)\n",
     "            if len(type_hints(enc)) > 0: self.input_types = first(type_hints(enc).values())\n",
     "            self._name = _get_name(enc)\n",
-    "        if dec: self.decodes = self.decodes.dispatch(dec)\n",
+    "        if dec: self.decodes.dispatch(dec)\n",
     "\n",
     "    @property\n",
     "    def name(self): return getattr(self, '_name', _get_name(self))\n",
@@ -355,16 +356,6 @@
     "test_eq(f1(1), 2) # f1(1) is the same as f1.encode(1)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class A(Transform):\n",
-    "    def encodes(self,x:int): return x+1"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -624,26 +615,6 @@
     "test_eq_type(f(FloatSubclass(3.0)), FloatSubclass(6.0))"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "__main__.FloatSubclass"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "type(f(FloatSubclass(3.0)))"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -1083,7 +1054,7 @@
      "data": {
       "text/plain": [
        "A:\n",
-       "encodes: <function <function noop at 0x111e2be50> with 2 method(s)>decodes: <function <function noop at 0x111e2be50> with 2 method(s)>"
+       "encodes: <function <function noop at 0x11fa2aa60> with 2 method(s)>decodes: <function <function noop at 0x11fa2aa60> with 2 method(s)>"
       ]
      },
      "execution_count": null,
@@ -1113,7 +1084,7 @@
      "data": {
       "text/plain": [
        "A -- {'a': 1, 'b': 2}:\n",
-       "encodes: <function <function noop at 0x111e2be50> with 3 method(s)>decodes: <function <function Transform.decodes at 0x115652f70> with 1 method(s)>"
+       "encodes: <function <function noop at 0x11fa2aa60> with 3 method(s)>decodes: <function <function Transform.decodes at 0x123253f70> with 1 method(s)>"
       ]
      },
      "execution_count": null,