update widgets imports

minrk · minrk · commit 1905adca735c · 2016-06-14T08:55:29.000+02:00
use ipywidgets
diff --git a/examples/Customization/appconfig.py b/examples/Customization/appconfig.py
@@ -32,7 +32,7 @@
 
 from IPython.config.configurable import Configurable
 from IPython.config.application import Application
-from IPython.utils.traitlets import (
+from traitlets import (
     Bool, Unicode, Int, List, Dict
 )
 
diff --git a/examples/Interactive Widgets/Beat Frequencies.ipynb b/examples/Interactive Widgets/Beat Frequencies.ipynb
@@ -43,7 +43,7 @@
     }
    ],
    "source": [
-    "from IPython.html.widgets import interactive\n",
+    "from ipywidgets import interactive\n",
     "from IPython.display import Audio, display\n",
     "import numpy as np"
    ]
diff --git a/examples/Interactive Widgets/Custom Widget - Hello World.ipynb b/examples/Interactive Widgets/Custom Widget - Hello World.ipynb
@@ -109,8 +109,8 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html import widgets\n",
-    "from IPython.utils.traitlets import Unicode\n",
+    "import ipywidgets as widgets\n",
+    "from traitlets import Unicode\n",
     "\n",
     "class HelloWidget(widgets.DOMWidget):\n",
     "    _view_name = Unicode('HelloView', sync=True)"
@@ -570,7 +570,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.utils.traitlets import CInt\n",
+    "from traitlets import CInt\n",
     "class SpinnerWidget(widgets.DOMWidget):\n",
     "    _view_name = Unicode('SpinnerView', sync=True)\n",
     "    value = CInt(0, sync=True)"
@@ -757,7 +757,7 @@
     "w2 = widgets.IntSlider()\n",
     "display(w1,w2)\n",
     "\n",
-    "from IPython.utils.traitlets import link\n",
+    "from traitlets import link\n",
     "mylink = link((w1, 'value'), (w2, 'value'))"
    ]
   },
diff --git a/examples/Interactive Widgets/Date Picker Widget.ipynb b/examples/Interactive Widgets/Date Picker Widget.ipynb
@@ -22,9 +22,9 @@
    "source": [
     "from __future__ import print_function # For py 2.7 compat\n",
     "\n",
-    "from IPython.html import widgets # Widget definitions\n",
+    "import ipywidgets as widgets # Widget definitions\n",
     "from IPython.display import display # Used to display widgets in the notebook\n",
-    "from IPython.utils.traitlets import Unicode # Used to declare attributes of our widget"
+    "from traitlets import Unicode # Used to declare attributes of our widget"
    ]
   },
   {
diff --git a/examples/Interactive Widgets/Exploring Graphs.ipynb b/examples/Interactive Widgets/Exploring Graphs.ipynb
@@ -30,7 +30,7 @@
     }
    ],
    "source": [
-    "from IPython.html.widgets import interact"
+    "from ipywidgets import interact"
    ]
   },
   {
diff --git a/examples/Interactive Widgets/Export As (nbconvert).ipynb b/examples/Interactive Widgets/Export As (nbconvert).ipynb
@@ -9,9 +9,9 @@
    "outputs": [],
    "source": [
     "# Widget related imports\n",
-    "from IPython.html import widgets\n",
+    "import ipywidgets as widgets\n",
     "from IPython.display import display, clear_output, Javascript\n",
-    "from IPython.utils.traitlets import Unicode\n",
+    "from traitlets import Unicode\n",
     "\n",
     "# nbconvert related imports\n",
     "from IPython.nbconvert import get_export_names, export_by_name\n",
diff --git a/examples/Interactive Widgets/Factoring.ipynb b/examples/Interactive Widgets/Factoring.ipynb
@@ -22,7 +22,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import interact\n",
+    "from ipywidgets import interact\n",
     "from IPython.display import display"
    ]
   },
diff --git a/examples/Interactive Widgets/File Upload Widget.ipynb b/examples/Interactive Widgets/File Upload Widget.ipynb
@@ -10,8 +10,8 @@
    "source": [
     "import base64\n",
     "from __future__ import print_function # py 2.7 compat.\n",
-    "from IPython.html import widgets # Widget definitions.\n",
-    "from IPython.utils.traitlets import Unicode # Traitlet needed to add synced attributes to the widget."
+    "import ipywidgets as widgets # Widget definitions.\n",
+    "from traitlets import Unicode # Traitlet needed to add synced attributes to the widget."
    ]
   },
   {
diff --git a/examples/Interactive Widgets/Image Browser.ipynb b/examples/Interactive Widgets/Image Browser.ipynb
@@ -34,7 +34,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import interact"
+    "from ipywidgets import interact"
    ]
   },
   {
diff --git a/examples/Interactive Widgets/Image Processing.ipynb b/examples/Interactive Widgets/Image Processing.ipynb
@@ -22,7 +22,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import interact, interactive, fixed\n",
+    "from ipywidgets import interact, interactive, fixed\n",
     "from IPython.display import display"
    ]
   },
diff --git a/examples/Interactive Widgets/Lorenz Differential Equations.ipynb b/examples/Interactive Widgets/Lorenz Differential Equations.ipynb
@@ -57,7 +57,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import interact, interactive\n",
+    "from ipywidgets import interact, interactive\n",
     "from IPython.display import clear_output, display, HTML"
    ]
   },
diff --git a/examples/Interactive Widgets/Variable Inspector.ipynb b/examples/Interactive Widgets/Variable Inspector.ipynb
@@ -29,7 +29,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html import widgets # Loads the Widget framework.\n",
+    "import ipywidgets as widgets # Loads the Widget framework.\n",
     "from IPython.core.magics.namespace import NamespaceMagics # Used to query namespace.\n",
     "\n",
     "# For this example, hide these names, just to avoid polluting the namespace further\n",
diff --git a/examples/Interactive Widgets/Widget Basics.ipynb b/examples/Interactive Widgets/Widget Basics.ipynb
@@ -68,7 +68,7 @@
     }
    },
    "source": [
-    "To use the widget framework, you need to **import `IPython.html.widgets`**."
+    "To use the widget framework, you need to **import `ipywidgets`**."
    ]
   },
   {
@@ -79,7 +79,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import *"
+    "from ipywidgets import *"
    ]
   },
   {
@@ -374,7 +374,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.utils.traitlets import link\n",
+    "from traitlets import link\n",
     "a = FloatText()\n",
     "b = FloatSlider()\n",
     "c = FloatProgress()\n",
diff --git a/examples/Interactive Widgets/Widget Events.ipynb b/examples/Interactive Widgets/Widget Events.ipynb
@@ -51,7 +51,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html import widgets\n",
+    "import ipywidgets as widgets\n",
     "print(widgets.Button.on_click.__doc__)"
    ]
   },
@@ -228,7 +228,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.utils import traitlets"
+    "import traitlets"
    ]
   },
   {
diff --git a/examples/Interactive Widgets/Widget List.ipynb b/examples/Interactive Widgets/Widget List.ipynb
@@ -40,7 +40,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html import widgets\n",
+    "import ipywidgets as widgets\n",
     "[n for n in dir(widgets) if not n.endswith('Widget') and n[0] == n[0].upper() and not n[0] == '_']"
    ]
   },
diff --git a/examples/Interactive Widgets/Widget Styling.ipynb b/examples/Interactive Widgets/Widget Styling.ipynb
@@ -33,7 +33,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html import widgets\n",
+    "import ipywidgets as widgets\n",
     "from IPython.display import display"
    ]
   },
diff --git a/examples/Notebook/Using nbconvert as a Library.ipynb b/examples/Notebook/Using nbconvert as a Library.ipynb
@@ -755,7 +755,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.utils.traitlets import Integer"
+    "from traitlets import Integer"
    ]
   },
   {
diff --git a/exercises/Interactive Widgets/Interact Exercises.ipynb b/exercises/Interactive Widgets/Interact Exercises.ipynb
@@ -38,7 +38,7 @@
    },
    "outputs": [],
    "source": [
-    "from IPython.html.widgets import *\n",
+    "from ipywidgets import *\n",
     "from IPython.display import display"
    ]
   },
diff --git a/exercises/Interactive Widgets/Widget Exercises.ipynb b/exercises/Interactive Widgets/Widget Exercises.ipynb
@@ -22,7 +22,7 @@
     "\n",
     "Create and display a `Text` widget.  Change that widget's `value` and some of it's other properties.  Discover the other properties by querying the `keys` property of the instance.  \n",
     "\n",
-    "*Hint: You'll need to import from IPython.html.widgets and IPython.display.*"
+    "*Hint: You'll need to import from ipywidgets and IPython.display.*"
    ]
   },
   {
diff --git a/exercises/Interactive Widgets/soln/colored.py b/exercises/Interactive Widgets/soln/colored.py
@@ -1,4 +1,4 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 w = HTML(value="Hello world!")
 w.color = 'red'
 w.background_color = 'yellow'
diff --git a/exercises/Interactive Widgets/soln/displaying.py b/exercises/Interactive Widgets/soln/displaying.py
@@ -1,4 +1,4 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 from IPython.display import display
 w = TextWidget(value="test")
 display(w)
diff --git a/exercises/Interactive Widgets/soln/link.py b/exercises/Interactive Widgets/soln/link.py
@@ -1,6 +1,6 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 from IPython.display import display
-from IPython.utils.traitlets import link
+from traitlets import link
 code = Textarea(description="Source:", value="Cool math: $\\frac{F}{m}=a$")
 preview = Latex()
 display(code, preview)
diff --git a/exercises/Interactive Widgets/soln/on_submit.py b/exercises/Interactive Widgets/soln/on_submit.py
@@ -1,4 +1,4 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 w = Text()
 def handle_submit(sender):
     print(sender.value)
diff --git a/exercises/Interactive Widgets/soln/on_trait_change.py b/exercises/Interactive Widgets/soln/on_trait_change.py
@@ -1,4 +1,4 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 w = Text()
 def handle_submit(name, new):
     print(new)
diff --git a/exercises/Interactive Widgets/soln/selection.py b/exercises/Interactive Widgets/soln/selection.py
@@ -1,4 +1,4 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 from IPython.display import display
 w = RadioButtons(options={"Left": 0, "Center": 1, "Right": 2}, description="Alignment:")
 display(w)
diff --git a/exercises/Interactive Widgets/soln/sliders.py b/exercises/Interactive Widgets/soln/sliders.py
@@ -1,4 +1,4 @@
-from IPython.html.widgets import *
+from ipywidgets import *
 from IPython.display import display
 sliders = [FloatSlider(description=str(i), orientation="vertical", value=50.) for i in range(10)]
 container = HBox(children=sliders)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`
`33`	`33`	`from IPython.config.configurable import Configurable`
`34`	`34`	`from IPython.config.application import Application`
`35`		`-from IPython.utils.traitlets import (`
	`35`	`+from traitlets import (`
`36`	`36`	`Bool, Unicode, Int, List, Dict`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`}`
`44`	`44`	`],`
`45`	`45`	`"source": [`
`46`		`- "from IPython.html.widgets import interactive\n",`
	`46`	`+ "from ipywidgets import interactive\n",`
`47`	`47`	`"from IPython.display import Audio, display\n",`
`48`	`48`	`"import numpy as np"`
`49`	`49`	`]`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@`
`22`	`22`	`"source": [`
`23`	`23`	`"from __future__ import print_function # For py 2.7 compat\n",`
`24`	`24`	`"\n",`
`25`		`- "from IPython.html import widgets # Widget definitions\n",`
	`25`	`+ "import ipywidgets as widgets # Widget definitions\n",`
`26`	`26`	`"from IPython.display import display # Used to display widgets in the notebook\n",`
`27`		`- "from IPython.utils.traitlets import Unicode # Used to declare attributes of our widget"`
	`27`	`+ "from traitlets import Unicode # Used to declare attributes of our widget"`
`28`	`28`	`]`
`29`	`29`	`},`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`}`
`31`	`31`	`],`
`32`	`32`	`"source": [`
`33`		`- "from IPython.html.widgets import interact"`
	`33`	`+ "from ipywidgets import interact"`
`34`	`34`	`]`
`35`	`35`	`},`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`},`
`23`	`23`	`"outputs": [],`
`24`	`24`	`"source": [`
`25`		`- "from IPython.html.widgets import interact\n",`
	`25`	`+ "from ipywidgets import interact\n",`
`26`	`26`	`"from IPython.display import display"`
`27`	`27`	`]`
`28`	`28`	`},`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`"source": [`
`11`	`11`	`"import base64\n",`
`12`	`12`	`"from __future__ import print_function # py 2.7 compat.\n",`
`13`		`- "from IPython.html import widgets # Widget definitions.\n",`
`14`		`- "from IPython.utils.traitlets import Unicode # Traitlet needed to add synced attributes to the widget."`
	`13`	`+ "import ipywidgets as widgets # Widget definitions.\n",`
	`14`	`+ "from traitlets import Unicode # Traitlet needed to add synced attributes to the widget."`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`},`
`35`	`35`	`"outputs": [],`
`36`	`36`	`"source": [`
`37`		`- "from IPython.html.widgets import interact"`
	`37`	`+ "from ipywidgets import interact"`
`38`	`38`	`]`
`39`	`39`	`},`
`40`	`40`	`{`