fixes #775

Author: jph00

fastcore/_modidx.py

@@ -8,9 +8,6 @@
   'syms': { 'fastcore.all': {},
             'fastcore.ansi': {},
             'fastcore.basics': { 'fastcore.basics.AttrDict': ('basics.html#attrdict', 'fastcore/basics.py'),
-                                 'fastcore.basics.AttrDict.__dir__': ('basics.html#attrdict.__dir__', 'fastcore/basics.py'),
-                                 'fastcore.basics.AttrDict.__getattr__': ('basics.html#attrdict.__getattr__', 'fastcore/basics.py'),
-                                 'fastcore.basics.AttrDict.__setattr__': ('basics.html#attrdict.__setattr__', 'fastcore/basics.py'),
                                  'fastcore.basics.AttrDict._repr_markdown_': ('basics.html#attrdict._repr_markdown_', 'fastcore/basics.py'),
                                  'fastcore.basics.AttrDict.copy': ('basics.html#attrdict.copy', 'fastcore/basics.py'),
                                  'fastcore.basics.AttrDictDefault': ('basics.html#attrdictdefault', 'fastcore/basics.py'),
@@ -110,6 +107,10 @@
                                  'fastcore.basics._typeerr': ('basics.html#_typeerr', 'fastcore/basics.py'),
                                  'fastcore.basics._using_attr': ('basics.html#_using_attr', 'fastcore/basics.py'),
                                  'fastcore.basics.add_props': ('basics.html#add_props', 'fastcore/basics.py'),
+                                 'fastcore.basics.adict': ('basics.html#adict', 'fastcore/basics.py'),
+                                 'fastcore.basics.adict.__dir__': ('basics.html#adict.__dir__', 'fastcore/basics.py'),
+                                 'fastcore.basics.adict.__getattr__': ('basics.html#adict.__getattr__', 'fastcore/basics.py'),
+                                 'fastcore.basics.adict.__setattr__': ('basics.html#adict.__setattr__', 'fastcore/basics.py'),
                                  'fastcore.basics.anno_ret': ('basics.html#anno_ret', 'fastcore/basics.py'),
                                  'fastcore.basics.annotations': ('basics.html#annotations', 'fastcore/basics.py'),
                                  'fastcore.basics.argnames': ('basics.html#argnames', 'fastcore/basics.py'),

fastcore/basics.py

@@ -7,7 +7,7 @@
            'type_map', 'ifnone', 'maybe_attr', 'basic_repr', 'BasicRepr', 'is_array', 'listify', 'tuplify', 'true',
            'NullType', 'tonull', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions', 'exec_local',
            'risinstance', 'ver2tuple', 'Inf', 'in_', 'ret_true', 'ret_false', 'stop', 'gen', 'chunked', 'otherwise',
-           'custom_dir', 'AttrDict', 'AttrDictDefault', 'NS', 'get_annotations_ex', 'eval_type', 'type_hints',
+           'custom_dir', 'adict', 'AttrDict', 'AttrDictDefault', 'NS', 'get_annotations_ex', 'eval_type', 'type_hints',
            'annotations', 'anno_ret', 'signature_ex', 'union2tuple', 'argnames', 'with_cast', 'store_attr', 'attrdict',
            'properties', 'camel2words', 'camel2snake', 'snake2camel', 'class2attr', 'getcallable', 'getattrs',
            'hasattrs', 'setattrs', 'try_attrs', 'DepProp', 'GetAttrBase', 'GetAttr', 'delegate_attr', 'ShowPrint',
@@ -269,18 +269,22 @@ def custom_dir(c, add):
     "Implement custom `__dir__`, adding `add` to `cls`"
     return object.__dir__(c) + listify(add)
 
-# %% ../nbs/01_basics.ipynb #48249e34
-class AttrDict(dict):
+# %% ../nbs/01_basics.ipynb #ea75f86b
+class adict(dict):
     "`dict` subclass that also provides access to keys as attrs"
     def __getattr__(self,k): return self[k] if k in self else stop(AttributeError(k))
     def __setattr__(self, k, v): (self.__setitem__,super().__setattr__)[k[0]=='_'](k,v)
     def __dir__(self): return super().__dir__() + list(self.keys())
+
+# %% ../nbs/01_basics.ipynb #28bf9743
+class AttrDict(adict):
+    "`dict` subclass that also provides access to keys as attrs, and has a pretty markdown repr"
     def _repr_markdown_(self): return f'```python\n{pprint.pformat(self, indent=2)}\n```'
     def copy(self): return AttrDict(**self)
 
 # %% ../nbs/01_basics.ipynb #cb8a0ff4
 class AttrDictDefault(AttrDict):
-    "`AttrDict` subclass that returns `None` for missing attrs"
+    "`AttrDict` subclass that returns `default_` for missing attrs"
     def __init__(self, *args, default_=None, **kwargs):
         self.default_ = default_
         super().__init__(*args, **kwargs)

nbs/01_basics.ipynb

@@ -1683,28 +1683,26 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "48249e34",
+   "id": "ea75f86b",
    "metadata": {},
    "outputs": [],
    "source": [
     "#| export\n",
-    "class AttrDict(dict):\n",
+    "class adict(dict):\n",
     "    \"`dict` subclass that also provides access to keys as attrs\"\n",
     "    def __getattr__(self,k): return self[k] if k in self else stop(AttributeError(k))\n",
     "    def __setattr__(self, k, v): (self.__setitem__,super().__setattr__)[k[0]=='_'](k,v)\n",
-    "    def __dir__(self): return super().__dir__() + list(self.keys())\n",
-    "    def _repr_markdown_(self): return f'```python\\n{pprint.pformat(self, indent=2)}\\n```'\n",
-    "    def copy(self): return AttrDict(**self)"
+    "    def __dir__(self): return super().__dir__() + list(self.keys())"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "80c67bed",
+   "id": "3e21c1e9",
    "metadata": {},
    "outputs": [],
    "source": [
-    "d = AttrDict(a=1,b=\"two\")\n",
+    "d = adict(a=1,b=\"two\")\n",
     "test_eq(d.a, 1)\n",
     "test_eq(d['b'], 'two')\n",
     "test_eq(d.get('c','nope'), 'nope')\n",
@@ -1717,6 +1715,20 @@
     "assert 'a' in dir(d)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "28bf9743",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#| export\n",
+    "class AttrDict(adict):\n",
+    "    \"`dict` subclass that also provides access to keys as attrs, and has a pretty markdown repr\"\n",
+    "    def _repr_markdown_(self): return f'```python\\n{pprint.pformat(self, indent=2)}\\n```'\n",
+    "    def copy(self): return AttrDict(**self)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "ebf2a7a5",
@@ -1728,7 +1740,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "45d3197a",
+   "id": "d33822c6",
    "metadata": {},
    "outputs": [
     {
@@ -1758,6 +1770,8 @@
     }
    ],
    "source": [
+    "d = AttrDict(a=1,b=\"two\")\n",
+    "\n",
     "_test_dict = {'a':1, 'b': {'c':1, 'd':2}, 'c': {'c':1, 'd':2}, 'd': {'c':1, 'd':2},\n",
     "              'e': {'c':1, 'd':2}, 'f': {'c':1, 'd':2, 'e': 4, 'f':[1,2,3,4,5]}}\n",
     "AttrDict(_test_dict)"
@@ -1772,7 +1786,7 @@
    "source": [
     "#| export\n",
     "class AttrDictDefault(AttrDict):\n",
-    "    \"`AttrDict` subclass that returns `None` for missing attrs\"\n",
+    "    \"`AttrDict` subclass that returns `default_` for missing attrs\"\n",
     "    def __init__(self, *args, default_=None, **kwargs):\n",
     "        self.default_ = default_\n",
     "        super().__init__(*args, **kwargs)\n",