fixes #195

Author: jph00

fastcore/basics.py

@@ -237,10 +237,10 @@ def anno_ret(func):
     return annotations(func).get('return', None) if func else None
 
 # Cell
-def argnames(f):
-    "Names of arguments to function `f`"
-    code = f.__code__
-    return code.co_varnames[:code.co_argcount]
+def argnames(f, frame=False):
+    "Names of arguments to function or frame `f`"
+    code = getattr(f, 'f_code' if frame else '__code__')
+    return code.co_varnames[:code.co_argcount+code.co_kwonlyargcount]
 
 # Cell
 def with_cast(f):
@@ -271,7 +271,7 @@ def _store_attr(self, anno, **attrs):
 def store_attr(names=None, self=None, but='', cast=False, **attrs):
     "Store params named in comma-separated `names` from calling context into attrs in `self`"
     fr = sys._getframe(1)
-    args = fr.f_code.co_varnames[:fr.f_code.co_argcount+fr.f_code.co_kwonlyargcount]
+    args = argnames(fr, True)
     if self: args = ('self', *args)
     else: self = fr.f_locals[args[0]]
     if not hasattr(self, '__stored_args__'): self.__stored_args__ = {}

nbs/01_basics.ipynb

@@ -1391,10 +1391,19 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def argnames(f):\n",
-    "    \"Names of arguments to function `f`\"\n",
-    "    code = f.__code__\n",
-    "    return code.co_varnames[:code.co_argcount]"
+    "def argnames(f, frame=False):\n",
+    "    \"Names of arguments to function or frame `f`\"\n",
+    "    code = getattr(f, 'f_code' if frame else '__code__')\n",
+    "    return code.co_varnames[:code.co_argcount+code.co_kwonlyargcount]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "test_eq(argnames(f), ['x'])"
    ]
   },
   {
@@ -1459,7 +1468,7 @@
     "def store_attr(names=None, self=None, but='', cast=False, **attrs):\n",
     "    \"Store params named in comma-separated `names` from calling context into attrs in `self`\"\n",
     "    fr = sys._getframe(1)\n",
-    "    args = fr.f_code.co_varnames[:fr.f_code.co_argcount+fr.f_code.co_kwonlyargcount]\n",
+    "    args = argnames(fr, True)\n",
     "    if self: args = ('self', *args)\n",
     "    else: self = fr.f_locals[args[0]]\n",
     "    if not hasattr(self, '__stored_args__'): self.__stored_args__ = {}\n",