Fix AttrDict

Author: jph00

fastcore/_nbdev.py

@@ -39,6 +39,7 @@
          "gen": "01_basics.ipynb",
          "chunked": "01_basics.ipynb",
          "otherwise": "01_basics.ipynb",
+         "custom_dir": "01_basics.ipynb",
          "AttrDict": "01_basics.ipynb",
          "with_cast": "01_basics.ipynb",
          "store_attr": "01_basics.ipynb",
@@ -104,7 +105,6 @@
          "working_directory": "02_foundation.ipynb",
          "add_docs": "02_foundation.ipynb",
          "docs": "02_foundation.ipynb",
-         "custom_dir": "02_foundation.ipynb",
          "coll_repr": "02_foundation.ipynb",
          "is_bool": "02_foundation.ipynb",
          "mask2idxs": "02_foundation.ipynb",

fastcore/basics.py

@@ -3,13 +3,13 @@
 __all__ = ['defaults', 'ifnone', 'maybe_attr', 'basic_repr', 'is_array', 'listify', 'get_class', 'mk_class',
            'wrap_class', 'ignore_exceptions', 'exec_local', 'risinstance', 'Inf', 'in_', 'lt', 'gt', 'le', 'ge', 'eq',
            'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'in_', 'true', 'stop', 'gen', 'chunked', 'otherwise',
-           'AttrDict', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr',
-           'hasattrs', 'setattrs', 'try_attrs', 'ShowPrint', 'Int', 'Str', 'Float', 'detuplify', 'replicate', 'setify',
-           'merge', 'range_of', 'groupby', 'last_index', 'filter_dict', 'filter_keys', 'filter_values', 'cycle',
-           'zip_cycle', 'sorted_ex', 'negate_func', 'argwhere', 'filter_ex', 'range_of', 'renumerate', 'first',
-           'nested_attr', 'nested_idx', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'arg0', 'arg1',
-           'arg2', 'arg3', 'arg4', 'bind', 'map_ex', 'compose', 'maps', 'partialler', 'instantiate', 'using_attr',
-           'Self', 'Self', 'PrettyString', 'even_mults', 'num_cpus', 'add_props', 'typed']
+           'custom_dir', 'AttrDict', 'with_cast', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel',
+           'class2attr', 'hasattrs', 'setattrs', 'try_attrs', 'ShowPrint', 'Int', 'Str', 'Float', 'detuplify',
+           'replicate', 'setify', 'merge', 'range_of', 'groupby', 'last_index', 'filter_dict', 'filter_keys',
+           'filter_values', 'cycle', 'zip_cycle', 'sorted_ex', 'negate_func', 'argwhere', 'filter_ex', 'range_of',
+           'renumerate', 'first', 'nested_attr', 'nested_idx', 'num_methods', 'rnum_methods', 'inum_methods',
+           'fastuple', 'arg0', 'arg1', 'arg2', 'arg3', 'arg4', 'bind', 'map_ex', 'compose', 'maps', 'partialler',
+           'instantiate', 'using_attr', 'Self', 'Self', 'PrettyString', 'even_mults', 'num_cpus', 'add_props', 'typed']
 
 # Cell
 from .imports import *
@@ -178,6 +178,11 @@ def otherwise(x, tst, y):
     "`y if tst(x) else x`"
     return y if tst(x) else x
 
+# Cell
+def custom_dir(c, add:list):
+    "Implement custom `__dir__`, adding `add` to `cls`"
+    return dir(type(c)) + list(c.__dict__.keys()) + add
+
 # Cell
 class AttrDict(dict):
     "`dict` subclass that also provides access to keys as attrs"

fastcore/foundation.py

@@ -1,8 +1,8 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/02_foundation.ipynb (unless otherwise specified).
 
-__all__ = ['copy_func', 'patch_to', 'patch', 'patch_property', 'working_directory', 'add_docs', 'docs', 'custom_dir',
-           'coll_repr', 'is_bool', 'mask2idxs', 'cycle', 'zip_cycle', 'is_indexer', 'GetAttr', 'delegate_attr',
-           'CollBase', 'L', 'save_config_file', 'read_config_file', 'Config']
+__all__ = ['copy_func', 'patch_to', 'patch', 'patch_property', 'working_directory', 'add_docs', 'docs', 'coll_repr',
+           'is_bool', 'mask2idxs', 'cycle', 'zip_cycle', 'is_indexer', 'GetAttr', 'delegate_attr', 'CollBase', 'L',
+           'save_config_file', 'read_config_file', 'Config']
 
 # Cell
 from .imports import *
@@ -82,11 +82,6 @@ def docs(cls):
     add_docs(cls, **cls._docs)
     return cls
 
-# Cell
-def custom_dir(c, add:list):
-    "Implement custom `__dir__`, adding `add` to `cls`"
-    return dir(type(c)) + list(c.__dict__.keys()) + add
-
 # Cell
 def coll_repr(c, max_n=10):
     "String repr of up to `max_n` items of (possibly lazy) collection `c`"

nbs/01_basics.ipynb

@@ -911,6 +911,38 @@
     "These functions reduce boilerplate when setting or manipulating attributes or properties of objects."
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def custom_dir(c, add:list):\n",
+    "    \"Implement custom `__dir__`, adding `add` to `cls`\"\n",
+    "    return dir(type(c)) + list(c.__dict__.keys()) + add"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "`custom_dir` allows you extract the [`__dict__` property of a class](https://stackoverflow.com/questions/19907442/explain-dict-attribute) and appends the list `add` to it."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "class _T: \n",
+    "    def f(): pass\n",
+    "\n",
+    "s = custom_dir(_T, add=['foo', 'bar']) # a list of everything in `__dict__` of `_T` with ['foo', 'bar'] appended.\n",
+    "assert {'foo', 'bar', 'f'}.issubset(s)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -966,7 +998,8 @@
     "test_eq(d['b'], 2)\n",
     "d['b'] = 3\n",
     "test_eq(d['b'], 3)\n",
-    "test_eq(d.b, 3)"
+    "test_eq(d.b, 3)\n",
+    "assert 'a' in dir(d)"
    ]
   },
   {

nbs/02_foundation.ipynb

@@ -565,38 +565,6 @@
     "test_eq(_T.f.__doc__, \"The docstring for method f.\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#export\n",
-    "def custom_dir(c, add:list):\n",
-    "    \"Implement custom `__dir__`, adding `add` to `cls`\"\n",
-    "    return dir(type(c)) + list(c.__dict__.keys()) + add"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "`custom_dir` allows you extract the [`__dict__` property of a class](https://stackoverflow.com/questions/19907442/explain-dict-attribute) and appends the list `add` to it."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class _T: \n",
-    "    def f(): pass\n",
-    "\n",
-    "s = custom_dir(_T, add=['foo', 'bar']) # a list of everything in `__dict__` of `_T` with ['foo', 'bar'] appended.\n",
-    "assert {'foo', 'bar', 'f'}.issubset(s)"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1552,7 +1520,7 @@
     {
      "data": {
       "text/plain": [
-       "[2, 'j', 1]"
+       "[3, 9, 'j']"
       ]
      },
      "execution_count": null,
@@ -2752,12 +2720,12 @@
       "Converted 00_test.ipynb.\n",
       "Converted 01_basics.ipynb.\n",
       "Converted 02_foundation.ipynb.\n",
-      "Converted 03_dispatch.ipynb.\n",
       "Converted 03_xtras.ipynb.\n",
-      "Converted 04_transform.ipynb.\n",
-      "Converted 05_logargs.ipynb.\n",
-      "Converted 06_meta.ipynb.\n",
-      "Converted 07_script.ipynb.\n",
+      "Converted 04_dispatch.ipynb.\n",
+      "Converted 05_transform.ipynb.\n",
+      "Converted 06_logargs.ipynb.\n",
+      "Converted 07_meta.ipynb.\n",
+      "Converted 08_script.ipynb.\n",
       "Converted index.ipynb.\n"
      ]
     }