Commit9019195

committed

Merge dictionaries to Readme and jpynb

1 parentc8413bf commit9019195Copy full SHA for 9019195

File tree

+54

-10

lines changed

+54

-10

lines changed

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ All contributions are welcome:`
`79`	`79`	`-[The get() Method](#the-get-method)`
`80`	`80`	`-[The setdefault() Method](#the-setdefault-method)`
`81`	`81`	`-[Pretty Printing](#pretty-printing)`
	`82`	`+-[Merge two dictionaries](#merge-two-dictionaries)`
`82`	`83`	`-[sets](#sets)`
`83`	`84`	`-[Initializing a set](#initializing-a-set)`
`84`	`85`	`-[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:
`1542`	`1543`
`1543`	`1544`	`[Return to the Top](#python-cheatsheet)`
`1544`	`1545`
	`1546`	`+###Merge two dictionaries`
	`1547`	`+`
	`1548`	+```python
	`1549`	`+# in Python 3.5+:`
	`1550`	`+>>> x= {'a':1,'b':2}`
	`1551`	`+>>> y= {'b':3,'c':4}`
	`1552`	`+>>> z= {x,y}`
	`1553`	`+>>> z`
	`1554`	`+{'c':4,'a':1,'b':3}`
	`1555`	`+`
	`1556`	`+# in Python 2.7`
	`1557`	`+>>> z=dict(x,**y)`
	`1558`	`+>>> z`
	`1559`	`+{'c':4,'a':1,'b':3}`
	`1560`	+```
	`1561`	`+`
`1545`	`1562`	`##sets`
`1546`	`1563`
`1547`	`1564`	`From the Python 3[documentation](https://docs.python.org/3/tutorial/datastructures.html)`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`
`5`	`5`	`FromHighest toLowest precedence:`
`6`	`6`
`7`		`-\| Operators\|Example\|`
`8`		`-\| ---------\| ----------------\|`
`9`		-\|\|`2 3 = 8`\|
`10`		-\| %\|`22 % 8 = 6`\|
`11`		-\| //\|`22 // 8 = 2`\|
`12`		-\| /\|`22 / 8 = 2.75`\|
`13`		-\| \|`3 3 = 9`\|
`14`		-\| -\|`5 - 2 = 3`\|
`15`		-\| +\|`2 + 2 = 4`\|
	`7`	`+\| Operators\|Operation\| Example\|`
	`8`	`+\| ---------\| ----------------\| ---------------\|`
	`9`	+\|\|Exponent\|`2 3 = 8`\|
	`10`	+\| %\|Modulus/Remaider\|`22 % 8 = 6`\|
	`11`	+\| //\|Integer division\|`22 // 8 = 2`\|
	`12`	+\| /\|Division\|`22 / 8 = 2.75`\|
	`13`	+\| \|Multiplication\|`3 3 = 9`\|
	`14`	+\| -\|Subtraction\|`5 - 2 = 3`\|
	`15`	+\| +\|Addition\|`2 + 2 = 4`\|
`16`	`16`
`17`	`17`	`Examples of expressions in the interactive shell:`
`18`	`18`
@@ -1225,6 +1225,7 @@ Using `setdefault` we could make the same code more shortly:
`1225`	`1225`	`'w':2,`
`1226`	`1226`	`'y':1}`
`1227`	`1227`	```
	`1228`	`+`
`1228`	`1229`	`###Merge two dictionaries`
`1229`	`1230`
`1230`	`1231`	```python
@@ -1241,7 +1242,6 @@ Using `setdefault` we could make the same code more shortly:
`1241`	`1242`	`{'c':4,'a':1,'b':3}`
`1242`	`1243`	```
`1243`	`1244`
`1244`		`-`
`1245`	`1245`	`##sets`
`1246`	`1246`
`1247`	`1247`	`From the Python 3[documentation](https://docs.python.org/3/tutorial/datastructures.html)`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@`
`85`	`85`	`" - [The get() Method](#the-get-method)\n",`
`86`	`86`	`" - [The setdefault() Method](#the-setdefault-method)\n",`
`87`	`87`	`" - [Pretty Printing](#pretty-printing)\n",`
	`88`	`+" - [Merge two dictionaries](#merge-two-dictionaries)\n",`
`88`	`89`	`"- [sets](#sets)\n",`
`89`	`90`	`" - [Initializing a set](#initializing-a-set)\n",`
`90`	`91`	`" - [sets: unordered collections of unique elements](#sets-unordered-collections-of-unique-elements)\n",`
`@@ -2599,6 +2600,32 @@`
`2599`	`2600`	`"source": [`
`2600`	`2601`	`"[Return to the Top](#python-cheatsheet)\n",`
`2601`	`2602`	`"\n",`
	`2603`	`+"### Merge two dictionaries"`
	`2604`	`+ ]`
	`2605`	`+ },`
	`2606`	`+ {`
	`2607`	`+"cell_type":"code",`
	`2608`	`+"execution_count":null,`
	`2609`	`+"metadata": {},`
	`2610`	`+"outputs": [],`
	`2611`	`+"source": [`
	`2612`	`+"# in Python 3.5+:\n",`
	`2613`	`+">>> x = {'a': 1, 'b': 2}\n",`
	`2614`	`+">>> y = {'b': 3, 'c': 4}\n",`
	`2615`	`+">>> z = {x, y}\n",`
	`2616`	`+">>> z\n",`
	`2617`	`+"{'c': 4, 'a': 1, 'b': 3}\n",`
	`2618`	`+"\n",`
	`2619`	`+"# in Python 2.7\n",`
	`2620`	`+">>> z = dict(x, **y)\n",`
	`2621`	`+">>> z\n",`
	`2622`	`+"{'c': 4, 'a': 1, 'b': 3}"`
	`2623`	`+ ]`
	`2624`	`+ },`
	`2625`	`+ {`
	`2626`	`+"cell_type":"markdown",`
	`2627`	`+"metadata": {},`
	`2628`	`+"source": [`
`2602`	`2629`	`"## sets\n",`
`2603`	`2630`	`"\n",`
`2604`	`2631`	`"From the Python 3 [documentation](https://docs.python.org/3/tutorial/datastructures.html)\n",`

1.74 KB

Binary file not shown.

Comments

(0)