Merge pull request #4760 from takluyver/examples-py3compat

Make examples and docs more Python 3 aware

examples/notebooks/Frontend-Kernel Model.ipynb

@@ -153,9 +153,8 @@
      "collapsed": false,
      "input": [
       "# Python 3 compat\n",
-      "try:\n",
-      "    raw_input\n",
-      "except NameError:\n",
+      "import sys\n",
+      "if sys.version_info[0] >= 3:\n",
       "    raw_input = input"
      ],
      "language": "python",

examples/notebooks/Importing Notebooks.ipynb

@@ -157,7 +157,7 @@
       "                # transform the input to executable Python\n",
       "                code = self.shell.input_transformer_manager.transform_cell(cell.input)\n",
       "                # run the code in themodule\n",
-      "                exec code in mod.__dict__\n",
+      "                exec(code, mod.__dict__)\n",
       "        finally:\n",
       "            self.shell.user_ns = save_user_ns\n",
       "        return mod\n"

examples/tests/Test Output Callbacks.ipynb

@@ -29,7 +29,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "print 'hi'"
+      "print('hi')"
      ],
      "language": "python",
      "metadata": {},
@@ -180,7 +180,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "# press tab after parentheses\n",
+      "# press shift-tab after parentheses\n",
       "int("
      ],
      "language": "python",
@@ -199,7 +199,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "# pres tab after f\n",
+      "# press tab after f\n",
       "f"
      ],
      "language": "python",
@@ -218,7 +218,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "import sys\n",
+      "import sys, time\n",
       "from IPython.display import clear_output"
      ],
      "language": "python",
@@ -232,7 +232,7 @@
       "for i in range(10):\n",
       "    clear_output()\n",
       "    time.sleep(0.25)\n",
-      "    print i\n",
+      "    print(i)\n",
       "    sys.stdout.flush()\n",
       "    time.sleep(0.25)\n"
      ],
@@ -247,7 +247,7 @@
       "for i in range(10):\n",
       "    clear_output(wait=True)\n",
       "    time.sleep(0.25)\n",
-      "    print i\n",
+      "    print(i)\n",
       "    sys.stdout.flush()\n"
      ],
      "language": "python",