use jslink, jsdlink for frontend link functions

IPython/html/widgets/__init__.py

@@ -11,7 +11,7 b' from .widget_selection import RadioButtons, ToggleButtons, Dropdown, Select'
 from .widget_selectioncontainer import Tab, Accordion
 from .widget_string import HTML, Latex, Text, Textarea
 from .interaction import interact, interactive, fixed, interact_manual
-from .widget_link import Link, link, DirectionalLink, directional_link, dlink
+from .widget_link import jslink, jsdlink, Link, DirectionalLink
 
 # Deprecated classes
 from .widget_bool import CheckboxWidget, ToggleButtonWidget

IPython/html/widgets/tests/test_link.py

@@ -3,37 +3,37 b''
 
 import nose.tools as nt
 
-from .. import link, dlink, ToggleButton
+from .. import jslink, jsdlink, ToggleButton
 from .test_interaction import setup, teardown
 
-def test_link_args():
+def test_jslink_args():
     with nt.assert_raises(TypeError):
-        link()
+        jslink()
     w1 = ToggleButton()
     with nt.assert_raises(TypeError):
-        link((w1, 'value'))
+        jslink((w1, 'value'))
     
     w2 = ToggleButton()
-    link((w1, 'value'), (w2, 'value'))
+    jslink((w1, 'value'), (w2, 'value'))
 
     with nt.assert_raises(TypeError):
-        link((w1, 'value'), (w2, 'nosuchtrait'))
+        jslink((w1, 'value'), (w2, 'nosuchtrait'))
 
     with nt.assert_raises(TypeError):
-        link((w1, 'value'), (w2, 'traits'))
+        jslink((w1, 'value'), (w2, 'traits'))
 
-def test_dlink_args():
+def test_jsdlink_args():
     with nt.assert_raises(TypeError):
-        dlink()
+        jsdlink()
     w1 = ToggleButton()
     with nt.assert_raises(TypeError):
-        dlink((w1, 'value'))
+        jsdlink((w1, 'value'))
     
     w2 = ToggleButton()
-    dlink((w1, 'value'), (w2, 'value'))
+    jsdlink((w1, 'value'), (w2, 'value'))
 
     with nt.assert_raises(TypeError):
-        dlink((w1, 'value'), (w2, 'nosuchtrait'))
+        jsdlink((w1, 'value'), (w2, 'nosuchtrait'))
 
     with nt.assert_raises(TypeError):
-        dlink((w1, 'value'), (w2, 'traits'))
+        jsdlink((w1, 'value'), (w2, 'traits'))

IPython/html/widgets/widget_link.py

@@ -52,7 +52,7 b' class Link(Widget):'
 
 
 @skip_doctest
-def link(*args):
+def jslink(*args):
     """Link traits from different widgets together on the frontend so they remain in sync.
 
     Parameters
@@ -93,7 +93,7 b' class DirectionalLink(Widget):'
         self.close()
 
 @skip_doctest
-def directional_link(source, *targets):
+def jsdlink(source, *targets):
     """Link the trait of a source widget with traits of target widgets in the frontend.
 
     Parameters
@@ -109,4 +109,3 b' def directional_link(source, *targets):'
     """
     return DirectionalLink(source=source, targets=targets)
 
-dlink = directional_link