Update for sh 2.x

Author: gjbex

hands-on/shell_interaction.ipynb

@@ -51,20 +51,13 @@
     "sh.ls('-l')"
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "The output can be used by assigning the command to a variable, and using the result's `stdout` attribute.  Note that the latter is a sequence of bytes, so it has to be decoded into a UTF-8 string for further processing."
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "cmd = sh.ls('-l', '-a', _encoding='UTF-8')"
+    "result = sh.ls('-l', '-a')"
    ]
   },
   {
@@ -73,7 +66,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lines = cmd.stdout.decode(encoding='utf8').split('\\n')"
+    "lines = result.split('\\n')"
    ]
   },
   {
@@ -109,7 +102,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "sh.ls()"
+    "for file in (line.strip() for line in sh.ls().split()):\n",
+    "    print(file)"
    ]
   },
   {
@@ -179,7 +173,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "sh.cat('tmp/date_file.txt')"
+    "print(sh.cat('tmp/date_file.txt'))"
    ]
   },
   {
@@ -228,14 +222,14 @@
    },
    "outputs": [],
    "source": [
-    "sh.grep(sh.ls('-l'), r'\\.ipynb$')"
+    "print(sh.grep('-e', r'\\.ipynb$', _in=sh.ls('-l')))"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Pipe the output of `cut` into `sort`."
+    "Pipe the output of `cut` into `sort`.  Also use the `_iter` argument to create a generator over standard output."
    ]
   },
   {
@@ -246,7 +240,8 @@
    },
    "outputs": [],
    "source": [
-    "sh.sort(sh.cut('-d', ' ', '-f', '5', 'tmp/date_file.txt'), '-r')"
+    "for line in sh.sort('-r', _in=sh.cut('-d', ' ', '-f', '5', 'tmp/date_file.txt'), _iter=True):\n",
+    "    print(line.strip())"
    ]
   },
   {
@@ -315,10 +310,12 @@
    },
    "outputs": [],
    "source": [
+    "process = sh.sleep(10, _bg=True, _bg_exc=False, _timeout=3)\n",
     "try:\n",
-    "    process = sh.sleep(10, _bg=True, _timeout=3)\n",
-    "except TimeoutError as error:\n",
-    "    print(error)"
+    "    process.wait()\n",
+    "except sh.TimeoutException as error:\n",
+    "    print('process timed out')\n",
+    "    print(error.exit_code)"
    ]
   },
   {
@@ -578,7 +575,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "process = subprocess.run('ls *.py', stdout=subprocess.PIPE, encoding='utf8', shell=True)"
+    "process = subprocess.run('ls *.ipynb', stdout=subprocess.PIPE, encoding='utf8', shell=True)"
    ]
   },
   {
@@ -653,7 +650,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "scrolled": true
+   },
    "outputs": [],
    "source": [
     "process.returncode"
@@ -676,7 +675,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.3"
+   "version": "3.11.6"
   }
  },
  "nbformat": 4,