Tweek slides.

Author: eigenholser

slides.ipynb

@@ -14,7 +14,7 @@
     "## Scott Overholser\n",
     "<br/>\n",
     "<br/>\n",
-    "## https://github.com/eigenholser\n"
+    "## https://github.com/eigenholser/python-magic-methods\n"
    ]
   },
   {
@@ -58,14 +58,48 @@
     }
    },
    "source": [
-    "# Python objects"
+    "# Magic Methods"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "source": [
+    "* Beautiful, intuitive, and standard ways of performing basic operations."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "source": [
+    "* Define meaning for operators so that we can use them on our own classes like they were built in types."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "subslide"
+    }
+   },
+   "source": [
+    "# Python Built-in Types"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
     "collapsed": false,
+    "scrolled": true,
     "slideshow": {
      "slide_type": "fragment"
     }
@@ -129,7 +163,7 @@
    },
    "outputs": [],
    "source": [
-    "(2).__pow__(3)"
+    "(2).__pow__(3) "
    ]
   },
   {
@@ -150,7 +184,7 @@
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
-     "slide_type": "slide"
+     "slide_type": "subslide"
     }
    },
    "source": [
@@ -165,7 +199,7 @@
     }
    },
    "source": [
-    "* We can add magic methods to objects that we create."
+    "* We can add magic methods to make our own objects behave like built-in types."
    ]
   },
   {
@@ -187,32 +221,18 @@
     }
    },
    "source": [
-    "* Expressiveness"
+    "* Expressiveness!"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {
-    "slideshow": {
-     "slide_type": "subslide"
-    }
-   },
-   "source": [
-    "## The Zen of Python"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": false,
     "slideshow": {
      "slide_type": "fragment"
     }
    },
-   "outputs": [],
    "source": [
-    "import this"
+    "* ...and it's zen."
    ]
   },
   {
@@ -223,29 +243,21 @@
     }
    },
    "source": [
-    "# Magic Methods"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* Beautiful, intuitive, and standard ways of performing basic operations."
+    "## The Zen of Python"
    ]
   },
   {
-   "cell_type": "markdown",
+   "cell_type": "code",
+   "execution_count": null,
    "metadata": {
+    "collapsed": false,
     "slideshow": {
      "slide_type": "fragment"
     }
    },
+   "outputs": [],
    "source": [
-    "* Define meaning for operators so that we can use them on our own classes like they were built in types."
+    "import this"
    ]
   },
   {
@@ -312,18 +324,20 @@
    },
    "outputs": [],
    "source": [
-    "CAN, JFK, LAX, SLC"
+    "CAN, JFK, LAX, SLC\n"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
-     "slide_type": "subslide"
+     "slide_type": "slide"
     }
    },
    "source": [
-    "## Instantiate some objects"
+    "# Object Construction\n",
+    "\n",
+    "* The `__init__(self, [args...])` magic method."
    ]
   },
   {
@@ -360,31 +374,9 @@
     }
    },
    "source": [
-    "# `__init__()`"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "# TODO: `__init__()` stuff"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "subslide"
-    }
-   },
-   "source": [
-    "# Equality\n",
+    "# Object Equality\n",
     "\n",
-    "* The `__eq__()` magic method."
+    "* The `__eq__(self, other)` magic method."
    ]
   },
   {
@@ -576,7 +568,7 @@
    "source": [
     "### Now let's try it with Magic!\n",
     "\n",
-    "* The `__eq__()` method is defined."
+    "* The `__eq__()` magic method is defined."
    ]
   },
   {
@@ -593,6 +585,17 @@
     "m_slc1 == m_slc2"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "source": [
+    "* That is exactly what we mean isn't it?!"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
@@ -671,7 +674,7 @@
     "\n",
     "* Intuitively, the distance between two points is the difference.\n",
     "* This implies subtraction.\n",
-    "* The `__sub__()` magic method."
+    "* The `__sub__(self, other)` magic method."
    ]
   },
   {
@@ -791,7 +794,11 @@
     }
    },
    "source": [
-    "# Representation of objects"
+    "# Representation of objects\n",
+    "\n",
+    "* The `__repr__(self)` magic method.\n",
+    "* The `__str__(self)` magic method.\n",
+    "* The `__format__(self, formatstr)` magic method."
    ]
   },
   {
@@ -802,7 +809,7 @@
     }
    },
    "source": [
-    "# `__repr__()`"
+    "# `__repr__(self)`"
    ]
   },
   {
@@ -855,7 +862,7 @@
     }
    },
    "source": [
-    "# `__str__()`"
+    "# `__str__(self)`"
    ]
   },
   {
@@ -908,7 +915,7 @@
     }
    },
    "source": [
-    "# `__format__()`"
+    "# `__format__(self, formatstr)`"
    ]
   },
   {
@@ -1151,7 +1158,7 @@
    "source": [
     "# Calling an object like a function\n",
     "\n",
-    "* `__call__()`"
+    "* `__call__(self, [args...])`"
    ]
   },
   {
@@ -1187,7 +1194,10 @@
     }
    },
    "source": [
-    "# `__del__()`"
+    "# Object Destruction\n",
+    "\n",
+    "* The `__del__(self)` magic method.\n",
+    "* Called when the object is garbage collected."
    ]
   },
   {
@@ -1252,7 +1262,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.3"
+   "version": "3.5.1+"
   }
  },
  "nbformat": 4,