Merge remote-tracking branch 'upstream/master'

fattij05 · Feb 26, 2018 · 2470cb0 · 2470cb0
2 parents f5e9915 + 72797a6
commit 2470cb0
Show file tree

Hide file tree

Showing 40 changed files with 121 additions and 24 deletions.
diff --git a/...ds and Functions/.ipynb_checkpoints/05-Lambda-Expressions-Map-and-Filter-checkpoint.ipynb b/...ds and Functions/.ipynb_checkpoints/05-Lambda-Expressions-Map-and-Filter-checkpoint.ipynb
@@ -217,7 +217,7 @@
    "source": [
     "## lambda expression\n",
     "\n",
-    "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",
+    "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",
     "\n",
     "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",
     "\n",

diff --git a/03-Methods and Functions/05-Lambda-Expressions-Map-and-Filter.ipynb b/03-Methods and Functions/05-Lambda-Expressions-Map-and-Filter.ipynb
@@ -217,7 +217,7 @@
    "source": [
     "## lambda expression\n",
     "\n",
-    "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",
+    "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",
     "\n",
     "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",
     "\n",

diff --git a/04-Milestone Project - 1/03-Milestone Project 1 - Complete Walkthrough Solution.ipynb b/04-Milestone Project - 1/03-Milestone Project 1 - Complete Walkthrough Solution.ipynb
@@ -52,9 +52,7 @@
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -116,9 +114,7 @@
   {
    "cell_type": "code",
    "execution_count": 4,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -171,9 +167,7 @@
   {
    "cell_type": "code",
    "execution_count": 6,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -235,9 +229,7 @@
   {
    "cell_type": "code",
    "execution_count": 8,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -375,27 +367,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 14,
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
       "   |   |\n",
-      "   | O |  \n",
+      "   | O | O\n",
       "   |   |\n",
       "-----------\n",
       "   |   |\n",
-      "   | O | X\n",
+      "   |   |  \n",
       "   |   |\n",
       "-----------\n",
       "   |   |\n",
-      " X | O | X\n",
+      " X | X | X\n",
       "   |   |\n",
-      "Player 2 has won!\n",
+      "Congratulations! You have won the game!\n",
       "Do you want to play again? Enter Yes or No: No\n"
      ]
     }
@@ -473,7 +463,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [default]",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -487,7 +477,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.3"
+   "version": "3.6.1"
   }
  },
  "nbformat": 4,

diff --git a/.../01-Modules and Packages-checkpoint.ipynb → .../01-Modules and Packages-checkpoint.ipynb b/.../01-Modules and Packages-checkpoint.ipynb → .../01-Modules and Packages-checkpoint.ipynb
diff --git a/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/SubPackage/__init__.py b/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/SubPackage/__init__.py
diff --git a/...ages/00-Modules_and_Packages/MyMainPackage/SubPackage/__pycache__/__init__.cpython-36.pyc b/...ages/00-Modules_and_Packages/MyMainPackage/SubPackage/__pycache__/__init__.cpython-36.pyc
diff --git a/...s/00-Modules_and_Packages/MyMainPackage/SubPackage/__pycache__/mysubscript.cpython-36.pyc b/...s/00-Modules_and_Packages/MyMainPackage/SubPackage/__pycache__/mysubscript.cpython-36.pyc
diff --git a/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/SubPackage/mysubscript.py b/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/SubPackage/mysubscript.py
@@ -0,0 +1,2 @@
+def sub_report():
+	print("Hey Im a function inside mysubscript")
diff --git a/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/__init__.py b/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/__init__.py
diff --git a/...es and Packages/00-Modules_and_Packages/MyMainPackage/__pycache__/__init__.cpython-36.pyc b/...es and Packages/00-Modules_and_Packages/MyMainPackage/__pycache__/__init__.cpython-36.pyc
diff --git a/...ackages/00-Modules_and_Packages/MyMainPackage/__pycache__/some_main_script.cpython-36.pyc b/...ackages/00-Modules_and_Packages/MyMainPackage/__pycache__/some_main_script.cpython-36.pyc
diff --git a/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/some_main_script.py b/06-Modules and Packages/00-Modules_and_Packages/MyMainPackage/some_main_script.py
@@ -0,0 +1,2 @@
+def report_main():
+	print("Hey I am in some_main_script in main package.")
diff --git a/06-Modules and Packages/00-Modules_and_Packages/mymodule.py b/06-Modules and Packages/00-Modules_and_Packages/mymodule.py
@@ -0,0 +1,2 @@
+def my_func():
+	print("Hey I am in mymodule.py")
diff --git a/06-Modules and Packages/00-Modules_and_Packages/myprogram.py b/06-Modules and Packages/00-Modules_and_Packages/myprogram.py
@@ -0,0 +1,6 @@
+from MyMainPackage.some_main_script import report_main
+from MyMainPackage.SubPackage import mysubscript
+
+report_main()
+
+mysubscript.sub_report()
diff --git a/06-Modules and Packages/01-Name_and_Main/Explanation.txt b/06-Modules and Packages/01-Name_and_Main/Explanation.txt
@@ -0,0 +1,76 @@
+Sometimes when you are importing from a module, you would like to know whether
+a modules function is being used as an import, or if you are using the original
+.py file of that module. In this case we can use the:
+
+      if __name__ == "__main__":
+
+line to determine this. For example:
+
+When your script is run by passing it as a command to the Python interpreter:
+
+    python myscript.py
+
+all of the code that is at indentation level 0 gets executed. Functions and
+classes that are defined are, well, defined, but none of their code gets ran.
+Unlike other languages, there's no main() function that gets run automatically
+- the main() function is implicitly all the code at the top level.
+
+In this case, the top-level code is an if block.  __name__ is a built-in variable
+ which evaluate to the name of the current module. However, if a module is being
+ run directly (as in myscript.py above), then __name__ instead is set to the
+ string "__main__". Thus, you can test whether your script is being run directly
+  or being imported by something else by testing
+
+    if __name__ == "__main__":
+        ...
+
+If that code is being imported into another module, the various function and
+class definitions will be imported, but the main() code won't get run. As a
+basic example, consider the following two scripts:
+
+    # file one.py
+    def func():
+        print("func() in one.py")
+
+    print("top-level in one.py")
+
+    if __name__ == "__main__":
+        print("one.py is being run directly")
+    else:
+        print("one.py is being imported into another module")
+
+and then:
+
+    # file two.py
+    import one
+
+    print("top-level in two.py")
+    one.func()
+
+    if __name__ == "__main__":
+        print("two.py is being run directly")
+    else:
+        print("two.py is being imported into another module")
+
+Now, if you invoke the interpreter as
+
+    python one.py
+
+The output will be
+
+    top-level in one.py
+
+one.py is being run directly
+If you run two.py instead:
+
+    python two.py
+
+You get
+
+  top-level in one.py
+  one.py is being imported into another module
+  top-level in two.py
+  func() in one.py
+  two.py is being run directly
+
+Thus, when module one gets loaded, its __name__ equals "one" instead of __main__.
diff --git a/06-Modules and Packages/01-Name_and_Main/one.py b/06-Modules and Packages/01-Name_and_Main/one.py
@@ -0,0 +1,9 @@
+def func():
+    print("func() ran in one.py")
+
+print("top-level print inside of one.py")
+
+if __name__ == "__main__":
+    print("one.py is being run directly")
+else:
+    print("one.py is being imported into another module")
diff --git a/06-Modules and Packages/01-Name_and_Main/two.py b/06-Modules and Packages/01-Name_and_Main/two.py
@@ -0,0 +1,10 @@
+import one
+
+print("top-level in two.py")
+
+one.func()
+
+if __name__ == "__main__":
+    print("two.py is being run directly")
+else:
+    print("two.py is being imported into another module")
diff --git a/...nd Packages/01-Modules and Packages.ipynb → ...s and Packages/Useful_Info_Notebook.ipynb b/...nd Packages/01-Modules and Packages.ipynb → ...s and Packages/Useful_Info_Notebook.ipynb
diff --git a/... and Exceptions Handling-checkpoint.ipynb → ... and Exceptions Handling-checkpoint.ipynb b/... and Exceptions Handling-checkpoint.ipynb → ... and Exceptions Handling-checkpoint.ipynb
diff --git a/... and Exceptions Homework-checkpoint.ipynb → ... and Exceptions Homework-checkpoint.ipynb b/... and Exceptions Homework-checkpoint.ipynb → ... and Exceptions Homework-checkpoint.ipynb
diff --git a/...ions Homework - Solution-checkpoint.ipynb → ...ions Homework - Solution-checkpoint.ipynb b/...ions Homework - Solution-checkpoint.ipynb → ...ions Homework - Solution-checkpoint.ipynb
diff --git a/...ckpoints/04-Unit Testing-checkpoint.ipynb → ...ckpoints/04-Unit Testing-checkpoint.ipynb b/...ckpoints/04-Unit Testing-checkpoint.ipynb → ...ckpoints/04-Unit Testing-checkpoint.ipynb
diff --git a/...g/01-Errors and Exceptions Handling.ipynb → ...g/01-Errors and Exceptions Handling.ipynb b/...g/01-Errors and Exceptions Handling.ipynb → ...g/01-Errors and Exceptions Handling.ipynb
diff --git a/...g/02-Errors and Exceptions Homework.ipynb → ...g/02-Errors and Exceptions Homework.ipynb b/...g/02-Errors and Exceptions Homework.ipynb → ...g/02-Errors and Exceptions Homework.ipynb
diff --git a/... and Exceptions Homework - Solution.ipynb → ... and Exceptions Homework - Solution.ipynb b/... and Exceptions Homework - Solution.ipynb → ... and Exceptions Homework - Solution.ipynb
diff --git a/... Exception Handling/04-Unit Testing.ipynb → ... Exception Handling/04-Unit Testing.ipynb b/... Exception Handling/04-Unit Testing.ipynb → ... Exception Handling/04-Unit Testing.ipynb
diff --git a/...n Handling/__pycache__/cap.cpython-36.pyc → ...n Handling/__pycache__/cap.cpython-36.pyc b/...n Handling/__pycache__/cap.cpython-36.pyc → ...n Handling/__pycache__/cap.cpython-36.pyc
diff --git a/06-Errors and Exception Handling/cap.py → 07-Errors and Exception Handling/cap.py b/06-Errors and Exception Handling/cap.py → 07-Errors and Exception Handling/cap.py
diff --git a/06-Errors and Exception Handling/simple1.py → 07-Errors and Exception Handling/simple1.py b/06-Errors and Exception Handling/simple1.py → 07-Errors and Exception Handling/simple1.py
diff --git a/06-Errors and Exception Handling/simple2.py → 07-Errors and Exception Handling/simple2.py b/06-Errors and Exception Handling/simple2.py → 07-Errors and Exception Handling/simple2.py
diff --git a/06-Errors and Exception Handling/test_cap.py → 07-Errors and Exception Handling/test_cap.py b/06-Errors and Exception Handling/test_cap.py → 07-Errors and Exception Handling/test_cap.py
diff --git a/06-Errors and Exception Handling/testfile → 07-Errors and Exception Handling/testfile b/06-Errors and Exception Handling/testfile → 07-Errors and Exception Handling/testfile
diff --git a/...e Project 2 - Assignment-checkpoint.ipynb → ...e Project 2 - Assignment-checkpoint.ipynb b/...e Project 2 - Assignment-checkpoint.ipynb → ...e Project 2 - Assignment-checkpoint.ipynb
diff --git a/...lkthrough Steps Workbook-checkpoint.ipynb → ...lkthrough Steps Workbook-checkpoint.ipynb b/...lkthrough Steps Workbook-checkpoint.ipynb → ...lkthrough Steps Workbook-checkpoint.ipynb
diff --git a/...ete Walkthrough Solution-checkpoint.ipynb → ...ete Walkthrough Solution-checkpoint.ipynb b/...ete Walkthrough Solution-checkpoint.ipynb → ...ete Walkthrough Solution-checkpoint.ipynb
diff --git a/...roject 2 - Solution Code-checkpoint.ipynb → ...roject 2 - Solution Code-checkpoint.ipynb b/...roject 2 - Solution Code-checkpoint.ipynb → ...roject 2 - Solution Code-checkpoint.ipynb
diff --git a/...01-Milestone Project 2 - Assignment.ipynb → ...01-Milestone Project 2 - Assignment.ipynb b/...01-Milestone Project 2 - Assignment.ipynb → ...01-Milestone Project 2 - Assignment.ipynb
diff --git a/...ject 2 - Walkthrough Steps Workbook.ipynb → ...ject 2 - Walkthrough Steps Workbook.ipynb b/...ject 2 - Walkthrough Steps Workbook.ipynb → ...ject 2 - Walkthrough Steps Workbook.ipynb
diff --git a/...t 2 - Complete Walkthrough Solution.ipynb → ...t 2 - Complete Walkthrough Solution.ipynb b/...t 2 - Complete Walkthrough Solution.ipynb → ...t 2 - Complete Walkthrough Solution.ipynb
diff --git a/...Milestone Project 2 - Solution Code.ipynb → ...Milestone Project 2 - Solution Code.ipynb b/...Milestone Project 2 - Solution Code.ipynb → ...Milestone Project 2 - Solution Code.ipynb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		def sub_report():
		print("Hey Im a function inside mysubscript")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		def report_main():
		print("Hey I am in some_main_script in main package.")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		def my_func():
		print("Hey I am in mymodule.py")