fixes #107

Author: jph00

fastcore/_nbdev.py

@@ -52,6 +52,8 @@
          "mk_class": "02_utils.ipynb",
          "wrap_class": "02_utils.ipynb",
          "ignore_exceptions": "02_utils.ipynb",
+         "stop": "02_utils.ipynb",
+         "AttrDict": "02_utils.ipynb",
          "dict2obj": "02_utils.ipynb",
          "store_attr": "02_utils.ipynb",
          "attrdict": "02_utils.ipynb",
@@ -86,7 +88,6 @@
          "in_": "02_utils.ipynb",
          "operator.in_": "02_utils.ipynb",
          "true": "02_utils.ipynb",
-         "stop": "02_utils.ipynb",
          "gen": "02_utils.ipynb",
          "chunked": "02_utils.ipynb",
          "trace": "02_utils.ipynb",

fastcore/utils.py

@@ -1,15 +1,15 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: nbs/02_utils.ipynb (unless otherwise specified).
 
-__all__ = ['ifnone', 'maybe_attr', 'basic_repr', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions', 'dict2obj',
-           'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr', 'hasattrs', 'setattrs',
-           'ShowPrint', 'Int', 'Str', 'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify', 'setify', 'merge',
-           'is_listy', 'range_of', 'groupby', 'last_index', 'shufflish', 'IterLen', 'ReindexCollection', 'num_methods',
-           'rnum_methods', 'inum_methods', 'fastuple', 'Inf', 'in_', 'lt', 'gt', 'le', 'ge', 'eq', 'ne', 'add', 'sub',
-           'mul', 'truediv', 'is_', 'is_not', 'in_', 'true', 'stop', 'gen', 'chunked', 'trace', 'compose', 'maps',
-           'partialler', 'mapped', 'instantiate', 'using_attr', 'Self', 'Self', 'remove_patches_path', 'bunzip',
-           'join_path_file', 'urlread', 'urljson', 'run', 'do_request', 'sort_by_run', 'PrettyString', 'round_multiple',
-           'even_mults', 'num_cpus', 'add_props', 'ContextManagers', 'set_num_threads', 'ProcessPoolExecutor',
-           'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen']
+__all__ = ['ifnone', 'maybe_attr', 'basic_repr', 'get_class', 'mk_class', 'wrap_class', 'ignore_exceptions', 'stop',
+           'AttrDict', 'dict2obj', 'store_attr', 'attrdict', 'properties', 'camel2snake', 'snake2camel', 'class2attr',
+           'hasattrs', 'setattrs', 'ShowPrint', 'Int', 'Str', 'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify',
+           'setify', 'merge', 'is_listy', 'range_of', 'groupby', 'last_index', 'shufflish', 'IterLen',
+           'ReindexCollection', 'num_methods', 'rnum_methods', 'inum_methods', 'fastuple', 'Inf', 'in_', 'lt', 'gt',
+           'le', 'ge', 'eq', 'ne', 'add', 'sub', 'mul', 'truediv', 'is_', 'is_not', 'in_', 'true', 'gen', 'chunked',
+           'trace', 'compose', 'maps', 'partialler', 'mapped', 'instantiate', 'using_attr', 'Self', 'Self',
+           'remove_patches_path', 'bunzip', 'join_path_file', 'urlread', 'urljson', 'run', 'do_request', 'sort_by_run',
+           'PrettyString', 'round_multiple', 'even_mults', 'num_cpus', 'add_props', 'ContextManagers',
+           'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen']
 
 # Cell
 from .imports import *
@@ -87,12 +87,27 @@ class ignore_exceptions:
     def __enter__(self): pass
     def __exit__(self, *args): return True
 
+# Cell
+def stop(e=StopIteration):
+    "Raises exception `e` (by default `StopException`)"
+    raise e
+
+# Cell
+class AttrDict(GetAttr, dict):
+    "`dict` subclass that also provides access to keys as attrs"
+    def _dir(self): return list(self.keys())
+    def __getattr__(self,k): return self[k] if k in self else stop(AttributeError(k))
+    def __setattr__(self, k, v):
+        if k.startswith('_'): super().__setattr__(k,v)
+        self[k] = v
+    def __dir__(self): return custom_dir(self,self._dir())
+
 # Cell
 def dict2obj(d):
-    "Convert (possibly nested) dicts (or lists of dicts) to `SimpleNamespace`"
+    "Convert (possibly nested) dicts (or lists of dicts) to `AttrDict`"
     if isinstance(d, (L,list)): return L(d).map(dict2obj)
     if not isinstance(d, dict): return d
-    return SimpleNamespace(**{k:dict2obj(v) for k,v in d.items()})
+    return AttrDict(**{k:dict2obj(v) for k,v in d.items()})
 
 # Cell
 def _store_attr(self, **attrs):
@@ -361,11 +376,6 @@ def true(*args, **kwargs):
     "Predicate: always `True`"
     return True
 
-# Cell
-def stop(e=StopIteration):
-    "Raises exception `e` (by default `StopException`) even if in an expression"
-    raise e
-
 # Cell
 def gen(func, seq, cond=true):
     "Like `(func(o) for o in seq if cond(func(o)))` but handles `StopIteration`"
@@ -569,13 +579,16 @@ def urljson(url):
     return json.loads(urlread(url))
 
 # Cell
-def run(cmd, *rest):
+def run(cmd, *rest, ignore_ex=False, as_bytes=False):
     "Pass `cmd` (splitting with `shlex` if string) to `subprocess.run`, returning `stdout`, or raise `IOError` on failure"
     if rest: cmd = (cmd,)+rest
     elif isinstance(cmd,str): cmd = shlex.split(cmd)
     res = subprocess.run(cmd, capture_output=True)
+    stdout = res.stdout
+    if not as_bytes: stdout = stdout.decode()
+    if ignore_ex: return (res.returncode, stdout)
     if res.returncode: raise IOError("{} ;; {}".format(res.stdout, res.stderr))
-    return res.stdout
+    return stdout
 
 # Cell
 def do_request(url, post=False, headers=None, **data):

nbs/02_utils.ipynb

@@ -294,7 +294,7 @@
     {
      "data": {
       "text/plain": [
-       "<__main__._t at 0x7efc6c1ec150>"
+       "<__main__._t at 0x7f2e862db250>"
       ]
      },
      "execution_count": null,
@@ -488,6 +488,53 @@
     "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 stop(e=StopIteration):\n",
+    "    \"Raises exception `e` (by default `StopException`)\"\n",
+    "    raise e"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "class AttrDict(GetAttr, dict):\n",
+    "    \"`dict` subclass that also provides access to keys as attrs\"\n",
+    "    def _dir(self): return list(self.keys())\n",
+    "    def __getattr__(self,k): return self[k] if k in self else stop(AttributeError(k))\n",
+    "    def __setattr__(self, k, v):\n",
+    "        if k.startswith('_'): super().__setattr__(k,v)\n",
+    "        self[k] = v\n",
+    "    def __dir__(self): return custom_dir(self,self._dir())"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d = AttrDict(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",
+    "d.b = 2\n",
+    "test_eq(d.b, 2)\n",
+    "test_eq(d['b'], 2)\n",
+    "d['b'] = 3\n",
+    "test_eq(d['b'], 3)\n",
+    "test_eq(d.b, 3)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -496,10 +543,10 @@
    "source": [
     "#export\n",
     "def dict2obj(d):\n",
-    "    \"Convert (possibly nested) dicts (or lists of dicts) to `SimpleNamespace`\"\n",
+    "    \"Convert (possibly nested) dicts (or lists of dicts) to `AttrDict`\"\n",
     "    if isinstance(d, (L,list)): return L(d).map(dict2obj)\n",
     "    if not isinstance(d, dict): return d\n",
-    "    return SimpleNamespace(**{k:dict2obj(v) for k,v in d.items()})"
+    "    return AttrDict(**{k:dict2obj(v) for k,v in d.items()})"
    ]
   },
   {
@@ -517,7 +564,7 @@
     {
      "data": {
       "text/plain": [
-       "namespace(a=1, b=namespace(c=2, d=3))"
+       "{'a': 1, 'b': {'c': 2, 'd': 3}}"
       ]
      },
      "execution_count": null,
@@ -529,6 +576,7 @@
     "d1 = dict(a=1, b=dict(c=2,d=3))\n",
     "d2 = dict2obj(d1)\n",
     "test_eq(d2.b.c, 2)\n",
+    "test_eq(d2.b['c'], 2)\n",
     "d2"
    ]
   },
@@ -2293,18 +2341,6 @@
     "assert true([])"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#export\n",
-    "def stop(e=StopIteration):\n",
-    "    \"Raises exception `e` (by default `StopException`) even if in an expression\"\n",
-    "    raise e"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,