Merge pull request #31 from BCSharp/ipython4_ch01

Upgraded Chapter 01 recipes to IPython 4.0.0

Author: BCSharp

.gitignore

@@ -2,7 +2,8 @@ data
 _old
 word
 .ipynb_checkpoints
+__pycache__
 matplotlibrc
 *.bat
 *.json
-*.txt
+*.txt

notebooks/chapter01_basic/01_notebook.ipynb

@@ -367,7 +367,8 @@
    "source": [
     "from collections import OrderedDict\n",
     "from IPython.display import display, clear_output\n",
-    "from IPython.html.widgets import DropdownWidget"
+    "from ipywidgets import Dropdown\n",
+    "#from IPython.html.widgets import DropdownWidget # IPython < 4.x"
    ]
   },
   {
@@ -378,10 +379,11 @@
    },
    "outputs": [],
    "source": [
-    "# We create a DropdownWidget, with a dictionary containing\n",
+    "# We create a Dropdown widget, with a dictionary containing\n",
     "# the keys (video name) and the values (Youtube identifier) \n",
     "# of every menu item.\n",
-    "dw = DropdownWidget(values=OrderedDict([\n",
+    "dw = Dropdown(options=OrderedDict([\n",
+    "# dw = DropdownWidget(values=OrderedDict([ # IPython < 4.x\n",
     "                        ('SciPy 2012', 'iwVvqwLDsJo'), \n",
     "                        ('PyCon 2012', '2G5YTlheCbw'),\n",
     "                        ('SciPy 2013', 'j9YpkSX7NNM')]))\n",
@@ -395,7 +397,8 @@
     "# contains the value of the selected item.\n",
     "dw.on_trait_change(on_value_change, 'value')\n",
     "# We choose a default value.\n",
-    "dw.value = dw.values['SciPy 2013']\n",
+    "dw.value = dw.options['SciPy 2013']\n",
+    "# dw.value = dw.values['SciPy 2013'] # IPyhon < 4.x\n",
     "# Finally, we display the widget.\n",
     "display(dw)"
    ]
@@ -433,7 +436,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.4.2"
+   "version": "3.5.0"
   }
  },
  "nbformat": 4,

notebooks/chapter01_basic/02_pandas.ipynb

@@ -57,7 +57,7 @@
    },
    "outputs": [],
    "source": [
-    "url = \"http://donnees.ville.montreal.qc.ca/storage/f/2014-01-20T20%3A48%3A50.296Z/2013.csv\""
+    "url = \"https://github.com/ipython-books/cookbook-data/raw/master/bikes.csv\""
    ]
   },
   {
@@ -256,7 +256,8 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import interact\n",
+    "from ipywidgets import interact\n",
+    "#from IPython.html.widgets import interact # IPython < 4.x\n",
     "@interact\n",
     "def plot(n=(1, 30)):\n",
     "    plt.figure(figsize=(8,4));\n",
@@ -280,6 +281,18 @@
    "display_name": "Python 3",
    "language": "python",
    "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.5.0"
   }
  },
  "nbformat": 4,