fix a couple of invalid notebooks

found via validation in  #6045

examples/Notebook/Raw Input.ipynb

@@ -1,196 +1,191 b''
 {
  "metadata": {
   "name": "",
   "signature": "sha256:ac5c21534f3dd013c78d4d201527f3ed4dea5b6fad4116b8d23c67ba107e48c3"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
  "worksheets": [
   {
    "cells": [
     {
      "cell_type": "heading",
      "level": 1,
      "metadata": {},
      "source": [
       "Using `raw_input` and `%debug` in the Notebook"
      ]
     },
     {
      "cell_type": "markdown",
      "metadata": {},
      "source": [
       "The Notebook has added support for `raw_input` and `%debug`, as of 1.0."
      ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "# Python 3 compat\n",
       "import sys\n",
       "if sys.version_info[0] >= 3:\n",
       "    raw_input = input"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [],
      "prompt_number": 1
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "name = raw_input(\"What is your name? \")\n",
       "name"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
-       "name": "stdout",
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "What is your name? Sir Robin\n"
        ]
       },
       {
        "metadata": {},
        "output_type": "pyout",
        "prompt_number": 2,
        "text": [
         "'Sir Robin'"
        ]
       }
      ],
      "prompt_number": 2
     },
     {
      "cell_type": "markdown",
      "metadata": {},
      "source": [
       "**Python 2-only**: the eval input works as well (`input` is just `eval(raw_input(prompt))`)"
      ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "fingers = input(\"How many fingers? \")\n",
       "fingers, type(fingers)"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
-       "name": "stdout",
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "How many fingers? 4\n"
        ]
       },
       {
        "metadata": {},
        "output_type": "pyout",
        "prompt_number": 3,
        "text": [
         "(4, int)"
        ]
       }
      ],
      "prompt_number": 3
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "def div(x, y):\n",
       "    return x/y\n",
       "\n",
       "div(1,0)"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
        "ename": "ZeroDivisionError",
        "evalue": "integer division or modulo by zero",
        "output_type": "pyerr",
        "traceback": [
         "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m\n\u001b[1;31mZeroDivisionError\u001b[0m                         Traceback (most recent call last)",
         "\u001b[1;32m<ipython-input-4-a5097cc0c0c5>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m()\u001b[0m\n\u001b[0;32m      2\u001b[0m     \u001b[1;32mreturn\u001b[0m \u001b[0mx\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0my\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      3\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 4\u001b[1;33m \u001b[0mdiv\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;36m1\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;36m0\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
         "\u001b[1;32m<ipython-input-4-a5097cc0c0c5>\u001b[0m in \u001b[0;36mdiv\u001b[1;34m(x, y)\u001b[0m\n\u001b[0;32m      1\u001b[0m \u001b[1;32mdef\u001b[0m \u001b[0mdiv\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mx\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0my\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 2\u001b[1;33m     \u001b[1;32mreturn\u001b[0m \u001b[0mx\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0my\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m      3\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m      4\u001b[0m \u001b[0mdiv\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;36m1\u001b[0m\u001b[1;33m,\u001b[0m\u001b[1;36m0\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
         "\u001b[1;31mZeroDivisionError\u001b[0m: integer division or modulo by zero"
        ]
       }
      ],
      "prompt_number": 4
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "%debug"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "> \u001b[1;32m<ipython-input-4-a5097cc0c0c5>\u001b[0m(2)\u001b[0;36mdiv\u001b[1;34m()\u001b[0m\n",
         "\u001b[1;32m      1 \u001b[1;33m\u001b[1;32mdef\u001b[0m \u001b[0mdiv\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mx\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0my\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
         "\u001b[0m\u001b[1;32m----> 2 \u001b[1;33m    \u001b[1;32mreturn\u001b[0m \u001b[0mx\u001b[0m\u001b[1;33m/\u001b[0m\u001b[0my\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
         "\u001b[0m\u001b[1;32m      3 \u001b[1;33m\u001b[1;33m\u001b[0m\u001b[0m\n",
         "\u001b[0m\n"
        ]
       },
       {
-       "name": "stdout",
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "ipdb> x\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "1\n"
        ]
       },
       {
-       "name": "stdout",
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "ipdb> y\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "0\n"
        ]
       },
       {
-       "name": "stdout",
        "output_type": "stream",
        "stream": "stdout",
        "text": [
         "ipdb> exit\n"
        ]
       }
      ],
      "prompt_number": 5
     }
    ],
    "metadata": {}
   }
  ]
 }
  No newline at end of file

tools/tests/heartbeat/gilsleep.ipynb

@@ -1,61 +1,61 b''
 {
  "metadata": {
   "name": "gilsleep"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
  "worksheets": [
   {
    "cells": [
     {
      "cell_type": "markdown",
      "metadata": {},
      "source": [
       "Holding the GIL for too long could disrupt the heartbeat due to non-copying sends.\n",
       "\n",
       "The following cell repeatedly calls a function that holds the GIL for five seconds.\n",
       "\n",
       "The heartbeat will fail after a few iterations prior to fixing Issue [#1260](https://github.com/ipython/ipython/issues/1260)."
      ]
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
       "import sys\n",
       "import time\n",
       "\n",
       "from cython import inline\n",
       "\n",
       "def gilsleep(t):\n",
       "    \"\"\"gil-holding sleep with cython.inline\"\"\"\n",
       "    code = '\\n'.join([\n",
       "        'from posix cimport unistd',\n",
       "        'unistd.sleep(t)',\n",
       "    ])\n",
       "    while True:\n",
       "        inline(code, quiet=True, t=t)\n",
       "        print time.time()\n",
       "        sys.stdout.flush() # this is important\n",
       "\n",
       "gilsleep(5)"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [],
      "prompt_number": 1
     },
     {
      "cell_type": "code",
      "collapsed": true,
      "input": [],
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": " "
+     "prompt_number": null
     }
    ],
    "metadata": {}
   }
  ]
 }
  No newline at end of file