minor updates to lesson 1

csweaver · csweaver · commit cde7dd37a655 · 2018-03-27T15:55:09.000-07:00
diff --git a/Lesson01_Variables/MilestonesSOLUTION.py b/Lesson01_Variables/MilestonesSOLUTION.py
@@ -1,4 +1,4 @@
-birth_year = eval(input("What is the birth year for the milestones?"))
+birth_year = input("What is the birth year for the milestones?")
 # raw_input always gives strings, so convert to int
 birth_year = int(birth_year)
 
@@ -7,6 +7,6 @@
 drinking_year = birth_year + 21
 president_year = birth_year + 35
 
-print(("You are able to drive in " + str(driving_year)))
-print(("You are able to drink in " + str(drinking_year)))
-print(("You are able to run for president in " + str(president_year)))
+print("You are able to drive in " + str(driving_year))
+print("You are able to drink in " + str(drinking_year))
+print("You are able to run for president in " + str(president_year))
diff --git a/Lesson01_Variables/lesson01.ipynb b/Lesson01_Variables/lesson01.ipynb
@@ -65,6 +65,33 @@
     "print(\"Hello World\")"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Jupyter notebooks will always print the value of the last line so you don't have to. You can suppress this with a semicolon ';'"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "\"Hello World\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "\"Hello World\";"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -135,7 +162,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": []
   },
@@ -192,7 +221,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print((3 * 2.1))"
+    "print(3 * 2.1)"
    ]
   },
   {
@@ -210,7 +239,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print((5 / 2))"
+    "print(5 / 2)"
    ]
   },
   {
@@ -242,7 +271,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": []
   },
@@ -302,7 +333,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": []
   },
@@ -320,7 +353,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(('Hello ' + 'Coding Circle'))"
+    "print('Hello ' + 'Coding Circle')"
    ]
   },
   {
@@ -329,7 +362,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print((\"The \" + WHALE + \" lives in the sea.\"))"
+    "print(\"The \" + WHALE + \" lives in the sea.\")"
    ]
   },
   {
@@ -345,7 +378,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print((\"My name is\" + \"Charlotte\"))"
+    "print(\"My name is\" + \"Charlotte\")"
    ]
   },
   {
@@ -359,7 +392,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": []
   },
@@ -369,7 +404,7 @@
    "source": [
     "## Asking the user for input\n",
     "\n",
-    "To get an input for the user we use the built-in function input() and assign it to a variable.\n",
+    "To get an input for the user we use the built-in function `input()` and assign it to a variable.\n",
     "\n",
     "NOTE: The result is always a string."
    ]
@@ -380,7 +415,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "my_name = eval(input())\n",
+    "my_name = input()\n",
     "print(my_name)"
    ]
   },
@@ -401,8 +436,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "favorite_ocean_animal = eval(input(\"What is your favorite sea creature?\\n\"))\n",
-    "print((\"The \" + favorite_ocean_animal + \" is so cool!\"))"
+    "favorite_ocean_animal = input(\"What is your favorite sea creature?\\n\")\n",
+    "print(\"The \" + favorite_ocean_animal + \" is so cool!\")"
    ]
   },
   {
@@ -422,9 +457,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "number_of_apples = eval(input(\"How many apples do you want?\\n\"))\n",
+    "number_of_apples = input(\"How many apples do you want?\\n\")\n",
     "number_of_apples_int = int(number_of_apples)\n",
-    "print((number_of_apples_int * 1.05))"
+    "print(number_of_apples_int * 1.05)"
    ]
   },
   {
@@ -438,7 +473,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": []
   },
@@ -455,13 +492,15 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "# Calculate the price of apples that a user wants\n",
-    "number_of_apples = eval(input(\"How many apples do you want?\\n\")) # Ask user for quantity of apples\n",
+    "number_of_apples = input(\"How many apples do you want?\\n\") # Ask user for quantity of apples\n",
     "number_of_apples_int = int(number_of_apples) # raw_input returns string, so convert to integer\n",
-    "print((number_of_apples_int * 1.05)) # multiply by price of apples"
+    "print(number_of_apples_int * 1.05) # multiply by price of apples"
    ]
   },
   {
@@ -475,7 +514,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": []
   },
@@ -497,7 +538,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "collapsed": true
+   },
    "outputs": [],
    "source": [
     "\n",
@@ -521,7 +564,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.1"
+   "version": "3.6.3"
   }
  },
  "nbformat": 4,
