Skip to content

Commit 2470cb0

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents f5e9915 + 72797a6 commit 2470cb0

File tree

40 files changed

+121
-24
lines changed

40 files changed

+121
-24
lines changed

03-Methods and Functions/.ipynb_checkpoints/05-Lambda-Expressions-Map-and-Filter-checkpoint.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
"source": [
218218
"## lambda expression\n",
219219
"\n",
220-
"One of Pythons most useful (and for recruits, confusing) tools is the lambda expression. lambda expressions allow us to create \"anonymous\" functions. This basically means we can quickly make ad-hoc functions without needing to properly define a function using def.\n",
220+
"One of Pythons most useful (and for beginners, confusing) tools is the lambda expression. lambda expressions allow us to create \"anonymous\" functions. This basically means we can quickly make ad-hoc functions without needing to properly define a function using def.\n",
221221
"\n",
222222
"Function objects returned by running lambda expressions work exactly the same as those created and assigned by defs. There is key difference that makes lambda useful in specialized roles:\n",
223223
"\n",

03-Methods and Functions/05-Lambda-Expressions-Map-and-Filter.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
"source": [
218218
"## lambda expression\n",
219219
"\n",
220-
"One of Pythons most useful (and for recruits, confusing) tools is the lambda expression. lambda expressions allow us to create \"anonymous\" functions. This basically means we can quickly make ad-hoc functions without needing to properly define a function using def.\n",
220+
"One of Pythons most useful (and for beginners, confusing) tools is the lambda expression. lambda expressions allow us to create \"anonymous\" functions. This basically means we can quickly make ad-hoc functions without needing to properly define a function using def.\n",
221221
"\n",
222222
"Function objects returned by running lambda expressions work exactly the same as those created and assigned by defs. There is key difference that makes lambda useful in specialized roles:\n",
223223
"\n",

04-Milestone Project - 1/03-Milestone Project 1 - Complete Walkthrough Solution.ipynb

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@
5252
{
5353
"cell_type": "code",
5454
"execution_count": 2,
55-
"metadata": {
56-
"collapsed": false
57-
},
55+
"metadata": {},
5856
"outputs": [
5957
{
6058
"name": "stdout",
@@ -116,9 +114,7 @@
116114
{
117115
"cell_type": "code",
118116
"execution_count": 4,
119-
"metadata": {
120-
"collapsed": false
121-
},
117+
"metadata": {},
122118
"outputs": [
123119
{
124120
"name": "stdout",
@@ -171,9 +167,7 @@
171167
{
172168
"cell_type": "code",
173169
"execution_count": 6,
174-
"metadata": {
175-
"collapsed": false
176-
},
170+
"metadata": {},
177171
"outputs": [
178172
{
179173
"name": "stdout",
@@ -235,9 +229,7 @@
235229
{
236230
"cell_type": "code",
237231
"execution_count": 8,
238-
"metadata": {
239-
"collapsed": false
240-
},
232+
"metadata": {},
241233
"outputs": [
242234
{
243235
"data": {
@@ -375,27 +367,25 @@
375367
},
376368
{
377369
"cell_type": "code",
378-
"execution_count": 16,
379-
"metadata": {
380-
"collapsed": false
381-
},
370+
"execution_count": 14,
371+
"metadata": {},
382372
"outputs": [
383373
{
384374
"name": "stdout",
385375
"output_type": "stream",
386376
"text": [
387377
" | |\n",
388-
" | O | \n",
378+
" | O | O\n",
389379
" | |\n",
390380
"-----------\n",
391381
" | |\n",
392-
" | O | X\n",
382+
" | | \n",
393383
" | |\n",
394384
"-----------\n",
395385
" | |\n",
396-
" X | O | X\n",
386+
" X | X | X\n",
397387
" | |\n",
398-
"Player 2 has won!\n",
388+
"Congratulations! You have won the game!\n",
399389
"Do you want to play again? Enter Yes or No: No\n"
400390
]
401391
}
@@ -473,7 +463,7 @@
473463
"metadata": {
474464
"anaconda-cloud": {},
475465
"kernelspec": {
476-
"display_name": "Python [default]",
466+
"display_name": "Python 3",
477467
"language": "python",
478468
"name": "python3"
479469
},
@@ -487,7 +477,7 @@
487477
"name": "python",
488478
"nbconvert_exporter": "python",
489479
"pygments_lexer": "ipython3",
490-
"version": "3.5.3"
480+
"version": "3.6.1"
491481
}
492482
},
493483
"nbformat": 4,

06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/SubPackage/__init__.py

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
def sub_report():
2+
print("Hey Im a function inside mysubscript")

06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)