Merge branch 'modules'

Author: treyhunner

Intro to Python (Part 3).ipynb

@@ -334,14 +334,9 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "Modules are used to make a programmer's life easier. A module is used to group functions, variables, and other things together in an understandable bundle."
-     ]
-    },
-    {
-     "cell_type": "markdown",
-     "metadata": {},
-     "source": [
-      "Modules can be used to do useful things - games, photo manipulation, graphics, financial calculations, and much more"
+      "Modules are used to make a programmer's life easier. A module is used to group functions, variables, and other things together in an understandable bundle.\n",
+      "\n",
+      "Python comes with lots of modules built-in.  For example there's a random module for generating randomnes.  Let's import it so we can use some of its functions:"
      ]
     },
     {
@@ -354,11 +349,18 @@
      "metadata": {},
      "outputs": []
     },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "The random module has a randint function which takes two parameters.  randint will return a random integer in between (or including) the two parameters.  For example we can generate a random number between 1 and 6."
+     ]
+    },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "random.randint(1,6)\n"
+      "random.randint(1, 6)\n"
      ],
      "language": "python",
      "metadata": {},
@@ -375,8 +377,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "vegas_die_1 = random.randint(1,6)\n",
-      "vegas_die_2 = random.randint(1,6)\n",
+      "vegas_die_1 = random.randint(1, 6)\n",
+      "vegas_die_2 = random.randint(1, 6)\n",
       "print (\"First die: \" + str(vegas_die_1))\n",
       "print (\"Second die: \" + str(vegas_die_2))\n",
       "print (\"You rolled a \" + str(vegas_die_1 + vegas_die_2))"
@@ -385,6 +387,13 @@
      "metadata": {},
      "outputs": []
     },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "choice is a function in the random module that returns a random item from a given list or string"
+     ]
+    },
     {
      "cell_type": "code",
      "collapsed": false,
@@ -399,32 +408,60 @@
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "choice is a function in the random module that returns an item"
+      "We could use random.choice to wish happy birthday to a random friend."
      ]
     },
     {
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "Modules and functions can make things really simple to do. For example we could in a few lines of code get and display a YouTube video"
+      "Let's make a function random_happy_birthday that takes a list of names and wishes a random person happy birthday"
      ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from IPython.display import YouTubeVideo\n",
-      "# a tutorial about Python at PyCon 2014 in Montreal, Canada by Jessica McKellar\n",
-      "YouTubeVideo('MirG-vJOg04')"
+      "def random_happy_birthday(names):\n",
+      "    name = random.choice(names)\n",
+      "    happy_birthday(name)"
      ],
      "language": "python",
      "metadata": {},
      "outputs": []
     },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Now let's try it out with a list of names:"
+     ]
+    },
     {
      "cell_type": "code",
      "collapsed": false,
-     "input": [],
+     "input": [
+      "random_happy_birthday([\"Alain\", \"Carol\", \"Rise\", \"Trey\"])"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "Modules and functions can make things really simple to do. For example we could in a few lines of code get and display a YouTube video"
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "from IPython.display import YouTubeVideo\n",
+      "# a tutorial about Python at PyCon 2014 in Montreal, Canada by Jessica McKellar\n",
+      "YouTubeVideo('MirG-vJOg04')"
+     ],
      "language": "python",
      "metadata": {},
      "outputs": []