fixes #262

Author: jph00

fastcore/basics.py

@@ -293,10 +293,10 @@ def store_attr(names=None, self=None, but='', cast=False, store_args=None, **att
     if store_args is None: store_args = not hasattr(self,'__slots__')
     if store_args and not hasattr(self, '__stored_args__'): self.__stored_args__ = {}
     anno = annotations(self) if cast else {}
-    if not attrs:
-        if names and isinstance(names,str): names = re.split(', *', names)
-        ns = names if names else getattr(self, '__slots__', args[1:])
-        attrs = {n:fr.f_locals[n] for n in ns}
+    if names and isinstance(names,str): names = re.split(', *', names)
+    ns = names if names else getattr(self, '__slots__', args[1:])
+    added = {n:fr.f_locals[n] for n in ns}
+    attrs = {**attrs, **added}
     if isinstance(but,str): but = re.split(', *', but)
     attrs = {k:v for k,v in attrs.items() if k not in but}
     return _store_attr(self, anno, **attrs)

nbs/01_basics.ipynb

@@ -1584,10 +1584,10 @@
     "    if store_args is None: store_args = not hasattr(self,'__slots__')\n",
     "    if store_args and not hasattr(self, '__stored_args__'): self.__stored_args__ = {}\n",
     "    anno = annotations(self) if cast else {}\n",
-    "    if not attrs:\n",
-    "        if names and isinstance(names,str): names = re.split(', *', names)\n",
-    "        ns = names if names else getattr(self, '__slots__', args[1:])\n",
-    "        attrs = {n:fr.f_locals[n] for n in ns}\n",
+    "    if names and isinstance(names,str): names = re.split(', *', names)\n",
+    "    ns = names if names else getattr(self, '__slots__', args[1:])\n",
+    "    added = {n:fr.f_locals[n] for n in ns}\n",
+    "    attrs = {**attrs, **added}\n",
     "    if isinstance(but,str): but = re.split(', *', but)\n",
     "    attrs = {k:v for k,v in attrs.items() if k not in but}\n",
     "    return _store_attr(self, anno, **attrs)"
@@ -1811,6 +1811,21 @@
     "assert t.a==1 and t.b==3 and t.c==2"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#hide\n",
+    "#ensure that kwargs work with names==None\n",
+    "class T:\n",
+    "    def __init__(self, a,b,c,**kwargs): store_attr(**kwargs)\n",
+    "\n",
+    "t = T(1,c=2,b=3,d=4,e=-1)\n",
+    "assert t.a==1 and t.b==3 and t.c==2 and t.d==4 and t.e==-1"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},