Merge dictionaries to Readme and jpynb

wilfredinni · wilfredinni · commit 9019195636f0 · 2018-07-08T17:41:37.000-04:00
diff --git a/README.md b/README.md
@@ -79,6 +79,7 @@ All contributions are welcome:
     - [The get() Method](#the-get-method)
     - [The setdefault() Method](#the-setdefault-method)
     - [Pretty Printing](#pretty-printing)
+    - [Merge two dictionaries](#merge-two-dictionaries)
 - [sets](#sets)
     - [Initializing a set](#initializing-a-set)
     - [sets: unordered collections of unique elements](#sets-unordered-collections-of-unique-elements)
@@ -1542,6 +1543,22 @@ Using `setdefault` we could make the same code more shortly:
 
 [*Return to the Top*](#python-cheatsheet)
 
+### Merge two dictionaries
+
+```python
+# in Python 3.5+:
+>>> x = {'a': 1, 'b': 2}
+>>> y = {'b': 3, 'c': 4}
+>>> z = {**x, **y}
+>>> z
+{'c': 4, 'a': 1, 'b': 3}
+
+# in Python 2.7
+>>> z = dict(x, **y)
+>>> z
+{'c': 4, 'a': 1, 'b': 3}
+```
+
 ## sets
 
 From the Python 3 [documentation](https://docs.python.org/3/tutorial/datastructures.html)
diff --git a/blog_files/pysheet.md b/blog_files/pysheet.md
@@ -4,15 +4,15 @@
 
 From **Highest** to **Lowest** precedence:
 
-| Operators | Example          |
-| --------- | ---------------- |
-| **        |  `2 ** 3 = 8`    |
-| %         |  `22 % 8 = 6`    |
-| //        |  `22 // 8 = 2`   |
-| /         |  `22 / 8 = 2.75` |
-| *         |  `3 * 3 = 9`     |
-| -         |  `5 - 2 = 3`     |
-| +         |  `2 + 2 = 4`     |
+| Operators | Operation        | Example         |
+| --------- | ---------------- | --------------- |
+| **        | Exponent         | `2 ** 3 = 8`    |
+| %         | Modulus/Remaider | `22 % 8 = 6`    |
+| //        | Integer division | `22 // 8 = 2`   |
+| /         | Division         | `22 / 8 = 2.75` |
+| *         | Multiplication   | `3 * 3 = 9`     |
+| -         | Subtraction      | `5 - 2 = 3`     |
+| +         | Addition         | `2 + 2 = 4`     |
 
 Examples of expressions in the interactive shell:
 
@@ -1225,6 +1225,7 @@ Using `setdefault` we could make the same code more shortly:
  'w': 2,
  'y': 1}
 ```
+
 ### Merge two dictionaries
 
 ```python
@@ -1241,7 +1242,6 @@ Using `setdefault` we could make the same code more shortly:
 {'c': 4, 'a': 1, 'b': 3}
 ```
 
-
 ## sets
 
 From the Python 3 [documentation](https://docs.python.org/3/tutorial/datastructures.html)
diff --git a/python_cheat_sheet.ipynb b/python_cheat_sheet.ipynb
@@ -85,6 +85,7 @@
     "    - [The get() Method](#the-get-method)\n",
     "    - [The setdefault() Method](#the-setdefault-method)\n",
     "    - [Pretty Printing](#pretty-printing)\n",
+    "    - [Merge two dictionaries](#merge-two-dictionaries)\n",
     "- [sets](#sets)\n",
     "    - [Initializing a set](#initializing-a-set)\n",
     "    - [sets: unordered collections of unique elements](#sets-unordered-collections-of-unique-elements)\n",
@@ -2599,6 +2600,32 @@
    "source": [
     "[*Return to the Top*](#python-cheatsheet)\n",
     "\n",
+    "### Merge two dictionaries"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# in Python 3.5+:\n",
+    ">>> x = {'a': 1, 'b': 2}\n",
+    ">>> y = {'b': 3, 'c': 4}\n",
+    ">>> z = {**x, **y}\n",
+    ">>> z\n",
+    "{'c': 4, 'a': 1, 'b': 3}\n",
+    "\n",
+    "# in Python 2.7\n",
+    ">>> z = dict(x, **y)\n",
+    ">>> z\n",
+    "{'c': 4, 'a': 1, 'b': 3}"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
     "## sets\n",
     "\n",
     "From the Python 3 [documentation](https://docs.python.org/3/tutorial/datastructures.html)\n",
diff --git a/python_cheat_sheet.pdf b/python_cheat_sheet.pdf
