Update notebooks for string formatting, single letter variable names

Author: bhazelton

04_jupyter_and_python_intro/python_vars_and_flow_control.ipynb

@@ -695,9 +695,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my_dict = { 'tuple' : 'An immutable collection of ordered objects',\n",
-    "            'list' : 'A mutable collection of ordered objects',\n",
-    "            'dictionary' : 'A mutable collection of objects' }\n",
+    "my_dict = {\n",
+    "    'tuple' : 'An immutable collection of ordered objects',\n",
+    "    'list' : 'A mutable collection of ordered objects',\n",
+    "    'dictionary' : 'A mutable collection of objects'\n",
+    "}\n",
     "my_dict"
    ]
   },
@@ -1261,8 +1263,8 @@
    "outputs": [],
    "source": [
     "sum = 0\n",
-    "for i in range(10):\n",
-    "    sum += i\n",
+    "for index in range(10):\n",
+    "    sum += index\n",
     "print(sum)"
    ]
   },
@@ -1272,7 +1274,7 @@
    "source": [
     "#### For loops can be nested\n",
     "\n",
-    "_Note_: for more on formatting strings, see: [https://pyformat.info](https://pyformat.info)"
+    "_Note_: for more on formatting strings, see: [https://realpython.com/python-string-formatting/](https://realpython.com/python-string-formatting/)"
    ]
   },
   {
@@ -1281,9 +1283,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for i in range(1, 4):\n",
-    "    for j in range(1, 4):\n",
-    "        print('%d * %d = %d' % (i, j, i*j))  # Note string formatting here, %d means an integer"
+    "for index in range(1, 4):\n",
+    "    for index2 in range(1, 4):\n",
+    "        print(f'{index} * {index2} = {index * index2}')"
    ]
   },
   {
@@ -1299,10 +1301,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "for i in range(10):\n",
-    "    if i == 4:\n",
+    "for index in range(10):\n",
+    "    if index == 4:\n",
     "        break\n",
-    "i"
+    "index"
    ]
   },
   {
@@ -1319,11 +1321,11 @@
    "outputs": [],
    "source": [
     "sum = 0\n",
-    "for i in range(10):\n",
-    "    if (i == 5):\n",
+    "for index in range(10):\n",
+    "    if (index == 5):\n",
     "        continue\n",
     "    else:\n",
-    "        sum += i\n",
+    "        sum += index\n",
     "print(sum)"
    ]
   },
@@ -1341,10 +1343,10 @@
    "outputs": [],
    "source": [
     "sum = 0\n",
-    "for i in range(10):\n",
-    "    sum += i\n",
+    "for index in range(10):\n",
+    "    sum += index\n",
     "else:\n",
-    "    print('final i = %d, and sum = %d' % (i, sum))"
+    "    print(f'final index = {index}, and sum = {sum}')"
    ]
   },
   {
@@ -1361,8 +1363,8 @@
    "outputs": [],
    "source": [
     "my_string = \"SEDS\"\n",
-    "for c in my_string:\n",
-    "    print(c)"
+    "for char in my_string:\n",
+    "    print(char)"
    ]
   },
   {
@@ -1559,7 +1561,7 @@
    "outputs": [],
    "source": [
     "def print_name(first, last='the Clown'):\n",
-    "    print('Your name is %s %s' % (first, last))\n",
+    "    print(f'Your name is {first} {last}')\n",
     "    return"
    ]
   },
@@ -1610,7 +1612,7 @@
    "source": [
     "def print_name_age(first, last, age):\n",
     "    print_name(first, last)\n",
-    "    print('Your age is %d' % (age))\n",
+    "    print(f'Your age is (age)')\n",
     "    if age > 55:\n",
     "        print('You are really old.')\n",
     "    return"

05_pandas_more_git/data_manipulation.ipynb

@@ -85,6 +85,13 @@
     "import numpy as np"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -1040,15 +1047,6 @@
     "Whenever you do plotting in the IPython notebook, you will want to first run this *magic command* which configures the notebook to work well with plots:"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%matplotlib inline"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},