fixes #35

Author: jph00

01_funccall.ipynb

@@ -1543,14 +1543,14 @@
      "output_type": "stream",
      "text": [
       "Traceback (most recent call last):\n",
-      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_88095/2052945749.py\", line 14, in python\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_10039/2052945749.py\", line 14, in python\n",
       "    try: return _run(code, glb, loc)\n",
       "                ^^^^^^^^^^^^^^^^^^^^\n",
-      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_88095/1858893181.py\", line 18, in _run\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_10039/1858893181.py\", line 18, in _run\n",
       "    try: exec(compiled_code, glb, loc)\n",
       "         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n",
       "  File \"<ast>\", line 1, in <module>\n",
-      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_88095/2052945749.py\", line 9, in handler\n",
+      "  File \"/var/folders/51/b2_szf2945n072c0vj2cyty40000gn/T/ipykernel_10039/2052945749.py\", line 9, in handler\n",
       "    def handler(*args): raise TimeoutError()\n",
       "                        ^^^^^^^^^^^^^^^^^^^^\n",
       "TimeoutError\n",
@@ -1691,9 +1691,7 @@
     "    merged = {}\n",
     "    for o in listify(fs):\n",
     "        if isinstance(o, dict): merged |= o\n",
-    "        elif isinstance(o, type): merged |= {n:getattr(o,n) for n,m in o.__dict__.items() if isinstance(m, (staticmethod, classmethod))}\n",
     "        elif callable(o) and hasattr(o, '__name__'): merged |= {o.__name__: o}\n",
-    "        merged |= {n:getattr(o,n) for n, m in inspect.getmembers(o, inspect.ismethod)} | {n:m for n,m in o.__class__.__dict__.items() if isinstance(m, staticmethod)}\n",
     "    return merged"
    ]
   },
@@ -1740,134 +1738,6 @@
     "ns['sums'](1, 2)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "29d22f82",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class Dummy:\n",
-    "    def __init__(self,a): self.a = a\n",
-    "    def __call__(self): return self.a\n",
-    "    def sums(self, a, b): return a + b\n",
-    "    @staticmethod\n",
-    "    def subs(a, b): return a - b\n",
-    "    @classmethod\n",
-    "    def mults(cls, a, b): return a * b"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ca50b957",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'subs': <function __main__.Dummy.subs(a, b)>,\n",
-       " 'mults': <bound method Dummy.mults of <class '__main__.Dummy'>>}"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "ns = mk_ns(Dummy); ns"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "59ef734f",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "(-1, 6)"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "ns['subs'](1, 2), ns['mults'](3, 2)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "15871e6d",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'__call__': <bound method Dummy.__call__ of <__main__.Dummy object>>,\n",
-       " '__init__': <bound method Dummy.__init__ of <__main__.Dummy object>>,\n",
-       " 'mults': <bound method Dummy.mults of <class '__main__.Dummy'>>,\n",
-       " 'sums': <bound method Dummy.sums of <__main__.Dummy object>>,\n",
-       " 'subs': <staticmethod(<function Dummy.subs>)>}"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "d = Dummy(10)\n",
-    "ns = mk_ns(d); ns"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "13cb7685",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "(-1, 6, 5, 10)"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "ns['subs'](1, 2), ns['mults'](3, 2), ns['sums'](3, 2), ns['__call__']()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "2dfe13ae",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "(None, -99)"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "ns['__init__'](-99), ns['__call__']()"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1920,32 +1790,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "9aace64a",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "-1"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "call_func('subs', {'a': 1, 'b': 2}, ns=mk_ns(d))"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6c93c0ef",
+   "id": "3c638361",
    "metadata": {},
    "outputs": [],
    "source": [
-    "assert \"unsupported operand type(s) for -: 'int' and 'str'\" in call_func('subs', {'a': 1, 'b': '3'}, ns=mk_ns(d), raise_on_err=False)"
+    "assert \"unsupported operand type(s) for +: 'int' and 'str'\" in call_func('sums', {'a': 1, 'b': '3'}, ns=ns, raise_on_err=False)"
    ]
   },
   {
@@ -1955,7 +1804,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "test_fail(call_func, args=['subs', {'a': 1, 'b': '3'}], kwargs={'ns': mk_ns(d)})"
+    "test_fail(call_func, args=['sums', {'a': 1, 'b': '3'}], kwargs={'ns': ns})"
    ]
   },
   {

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 <!-- do not remove -->
 
+## 0.3.0
+
+
+
+
 ## 0.2.3
 
 ### New Features

settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = toolslm
 lib_name = toolslm
-version = 0.2.4
+version = 0.3.0
 min_python = 3.9
 license = apache2
 black_formatting = False

toolslm/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.4"
+__version__ = "0.3.0"

toolslm/funccall.py

@@ -188,9 +188,7 @@ def mk_ns(fs):
     merged = {}
     for o in listify(fs):
         if isinstance(o, dict): merged |= o
-        elif isinstance(o, type): merged |= {n:getattr(o,n) for n,m in o.__dict__.items() if isinstance(m, (staticmethod, classmethod))}
         elif callable(o) and hasattr(o, '__name__'): merged |= {o.__name__: o}
-        merged |= {n:getattr(o,n) for n, m in inspect.getmembers(o, inspect.ismethod)} | {n:m for n,m in o.__class__.__dict__.items() if isinstance(m, staticmethod)}
     return merged
 
 # %% ../01_funccall.ipynb