Added Resources to README and non-@-syntax version of callable object example.

Author: lgw4

README.markdown

@@ -1,3 +1,8 @@
-# pydecorators
+# Decorating Python: Python's Decorators Explained 
 
-## Beginner to intermediate level presentation on Python decorators.
+## Resources
+
+* Graham Dumpleton: [Graham Dumpleton on Decorators](http://blog.dscpl.com.au/search/label/decorators)
+* Real Python: [Primer on Python Decorators](https://realpython.com/blog/python/primer-on-python-decorators/)
+* Jeff Knupp: [Decorators Explained](http://www.jeffknupp.com/blog/2013/11/29/improve-your-python-decorators-explained/)
+* The Code Ship: [A guide to Python's function decorators](http://thecodeship.com/patterns/guide-to-python-function-decorators/)

pydecorators.ipynb

@@ -1,8 +1,7 @@
 {
  "metadata": {
-  "celltoolbar": "Raw Cell Format",
   "name": "",
-  "signature": "sha256:b7fafba0fc82a59cb7cf338ba66c116c70894fd255717b655cf92f97673c9043"
+  "signature": "sha256:9508ad401da191ade544e7d349ad8f99b7ecf0fdcfb71d8696001b5a26a47e70"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -79,7 +78,7 @@
       "\n",
       "func()\n",
       "\n",
-      "type(func)"
+      "print(type(func))"
      ],
      "language": "python",
      "metadata": {},
@@ -90,19 +89,12 @@
        "text": [
         "Before func() is called.\n",
         "Behavior from func().\n",
-        "After func() is called.\n"
-       ]
-      },
-      {
-       "metadata": {},
-       "output_type": "pyout",
-       "prompt_number": 2,
-       "text": [
-        "function"
+        "After func() is called.\n",
+        "<class 'function'>\n"
        ]
       }
      ],
-     "prompt_number": 2
+     "prompt_number": 3
     },
     {
      "cell_type": "markdown",
@@ -144,7 +136,7 @@
        ]
       }
      ],
-     "prompt_number": 9
+     "prompt_number": 1
     },
     {
      "cell_type": "markdown",
@@ -168,11 +160,14 @@
       "        self.f()\n",
       "        print(\"After {function_name}() is called.\".format(function_name=self.f.__name__))\n",
       "        \n",
-      "@DecoratorCls\n",
       "def func():\n",
       "    print(\"Behavior from func().\")\n",
       "    \n",
-      "func()"
+      "func = DecoratorCls(func)\n",
+      "\n",
+      "func()\n",
+      "\n",
+      "print(type(func))"
      ],
      "language": "python",
      "metadata": {},
@@ -183,26 +178,63 @@
        "text": [
         "Before func() is called.\n",
         "Behavior from func().\n",
-        "After func() is called.\n"
+        "After func() is called.\n",
+        "<class '__main__.DecoratorCls'>\n"
        ]
       }
      ],
-     "prompt_number": 4
+     "prompt_number": 2
     },
     {
      "cell_type": "markdown",
      "metadata": {},
      "source": [
-      "## So, Python Decorators are callable objects that modify the behavior of other callable objects."
+      "#### Again, this is equivalent to the code above."
      ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
-     "input": [],
+     "input": [
+      "class DecoratorCls(object):\n",
+      "    def __init__(self, f):\n",
+      "        self.f = f\n",
+      "        \n",
+      "    def __call__(self):\n",
+      "        print(\"Before {function_name}() is called.\".format(function_name=self.f.__name__))\n",
+      "        self.f()\n",
+      "        print(\"After {function_name}() is called.\".format(function_name=self.f.__name__))\n",
+      "        \n",
+      "@DecoratorCls\n",
+      "def func():\n",
+      "    print(\"Behavior from func().\")\n",
+      "    \n",
+      "func()\n",
+      "\n",
+      "print(type(func))"
+     ],
      "language": "python",
      "metadata": {},
-     "outputs": []
+     "outputs": [
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "Before func() is called.\n",
+        "Behavior from func().\n",
+        "After func() is called.\n",
+        "<class '__main__.DecoratorCls'>\n"
+       ]
+      }
+     ],
+     "prompt_number": 4
+    },
+    {
+     "cell_type": "markdown",
+     "metadata": {},
+     "source": [
+      "## So, Python Decorators are callable objects that modify the behavior of other callable objects."
+     ]
     }
    ],
    "metadata": {}