fixes #105

Author: jph00

fastcore/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.16"
+__version__ = "1.0.17"

fastcore/_nbdev.py

@@ -60,6 +60,7 @@
          "snake2camel": "02_utils.ipynb",
          "class2attr": "02_utils.ipynb",
          "hasattrs": "02_utils.ipynb",
+         "setattrs": "02_utils.ipynb",
          "ShowPrint": "02_utils.ipynb",
          "Int": "02_utils.ipynb",
          "Str": "02_utils.ipynb",
@@ -108,7 +109,7 @@
          "join_path_file": "02_utils.ipynb",
          "urlread": "02_utils.ipynb",
          "urljson": "02_utils.ipynb",
-         "run_proc": "02_utils.ipynb",
+         "run": "02_utils.ipynb",
          "do_request": "02_utils.ipynb",
          "sort_by_run": "02_utils.ipynb",
          "PrettyString": "02_utils.ipynb",

fastcore/utils.py

@@ -1,22 +1,22 @@
 # 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', 'ShowPrint',
-           'Int', 'Str', 'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify', 'setify', 'merge', 'is_listy',
-           'range_of', 'groupby', 'last_index', 'shufflish', 'IterLen', 'ReindexCollection', 'num_methods',
+           '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_proc', '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']
+           '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 *
 from .foundation import *
 from functools import wraps
 
-import mimetypes,bz2,pickle,random,json,urllib,subprocess
+import mimetypes,bz2,pickle,random,json,urllib,subprocess,shlex
 from contextlib import contextmanager
 from urllib.request import Request,urlopen
 from urllib.error import HTTPError
@@ -148,6 +148,12 @@ def hasattrs(o,attrs):
     "Test whether `o` contains all `attrs`"
     return all(hasattr(o,attr) for attr in attrs)
 
+# Cell
+def setattrs(dest, flds, src):
+    f = dict.get if isinstance(src, dict) else getattr
+    flds = re.split(r",\s*", flds)
+    for fld in flds: setattr(dest, fld, f(src, fld))
+
 # Cell
 #hide
 class ShowPrint:
@@ -563,9 +569,11 @@ def urljson(url):
     return json.loads(urlread(url))
 
 # Cell
-def run_proc(*args):
-    "Pass `args` to `subprocess.run`, returning `stdout`, or raise `IOError` on failure"
-    res = subprocess.run(args, capture_output=True)
+def run(cmd, *rest):
+    "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)
     if res.returncode: raise IOError("{} ;; {}".format(res.stdout, res.stderr))
     return res.stdout
 

nbs/02_utils.ipynb

@@ -20,7 +20,7 @@
     "from fastcore.foundation import *\n",
     "from functools import wraps\n",
     "\n",
-    "import mimetypes,bz2,pickle,random,json,urllib,subprocess\n",
+    "import mimetypes,bz2,pickle,random,json,urllib,subprocess,shlex\n",
     "from contextlib import contextmanager\n",
     "from urllib.request import Request,urlopen\n",
     "from urllib.error import HTTPError\n",
@@ -294,7 +294,7 @@
     {
      "data": {
       "text/plain": [
-       "<__main__._t at 0x7f756accd110>"
+       "<__main__._t at 0x7efc6c1ec150>"
       ]
      },
      "execution_count": null,
@@ -989,6 +989,45 @@
     "assert not hasattrs(1,('imag','foo'))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "#export\n",
+    "def setattrs(dest, flds, src):\n",
+    "    f = dict.get if isinstance(src, dict) else getattr\n",
+    "    flds = re.split(r\",\\s*\", flds)\n",
+    "    for fld in flds: setattr(dest, fld, f(src, fld))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d = dict(a=1,bb=\"2\",ignore=3)\n",
+    "o = SimpleNamespace()\n",
+    "setattrs(o, \"a,bb\", d)\n",
+    "test_eq(o.a, 1)\n",
+    "test_eq(o.bb, \"2\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d = SimpleNamespace(a=1,bb=\"2\",ignore=3)\n",
+    "o = SimpleNamespace()\n",
+    "setattrs(o, \"a,bb\", d)\n",
+    "test_eq(o.a, 1)\n",
+    "test_eq(o.bb, \"2\")"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -1668,7 +1707,7 @@
     {
      "data": {
       "text/plain": [
-       "['c', 'a', 'f', 'e', 'g', 'h', 'd', 'b']"
+       "['f', 'g', 'e', 'd', 'b', 'a', 'h', 'c']"
       ]
      },
      "execution_count": null,
@@ -3089,11 +3128,66 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "def run_proc(*args):\n",
-    "    \"Pass `args` to `subprocess.run`, returning `stdout`, or raise `IOError` on failure\"\n",
-    "    res = subprocess.run(args, capture_output=True)\n",
+    "def run(cmd, *rest, ignore_ex=False, as_bytes=False):\n",
+    "    \"Pass `cmd` (splitting with `shlex` if string) to `subprocess.run`, returning `stdout`, or raise `IOError` on failure\"\n",
+    "    if rest: cmd = (cmd,)+rest\n",
+    "    elif isinstance(cmd,str): cmd = shlex.split(cmd)\n",
+    "    res = subprocess.run(cmd, capture_output=True)\n",
+    "    stdout = res.stdout\n",
+    "    if not as_bytes: stdout = stdout.decode()\n",
+    "    if ignore_ex: return (res.returncode, stdout)\n",
     "    if res.returncode: raise IOError(\"{} ;; {}\".format(res.stdout, res.stderr))\n",
-    "    return res.stdout"
+    "    return stdout"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "You can pass a string (which will be split based on standard shell rules), a list, or pass args directly:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "assert 'ipynb' in run('ls -l')\n",
+    "assert 'ipynb' in run(['ls', '-l'])\n",
+    "assert 'ipynb' in run('ls', '-l')"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Some commands fail in non-error situations, like `grep`. Use `ignore_ex` in those cases, which will return a tuple of stdout and returncode:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "test_eq(run('grep asdfds 00_test.ipynb', ignore_ex=True)[0], 1)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "`run` automatically decodes returned bytes to a `str`. Use `as_bytes` to skip that:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "test_eq(run('echo hi', as_bytes=True), b'hi\\n')"
    ]
   },
   {

settings.ini

@@ -7,7 +7,7 @@ author = Jeremy Howard and Sylvain Gugger
 author_email = [email protected]
 copyright = fast.ai
 branch = master
-version = 1.0.16
+version = 1.0.17
 min_python = 3.6
 audience = Developers
 language = English