s/Int/CInt s/Float/CFloat

IPython/html/widgets/widget_button.py

@@ -1,91 +1,91 b''
 """ButtonWidget class.  
 
 Represents a button in the frontend using a widget.  Allows user to listen for
 click events on the button and trigger backend code when the clicks are fired.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import inspect
 import types
 
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Bool, Int
+from IPython.utils.traitlets import Unicode, Bool
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class ButtonWidget(DOMWidget):
     view_name = Unicode('ButtonView', sync=True)
 
     # Keys
     description = Unicode('', help="Description of the button (label).", sync=True)
     disabled = Bool(False, help="Enable or disable user changes.", sync=True)
     
 
     def __init__(self, **kwargs):
         super(ButtonWidget, self).__init__(**kwargs)
         
         self._click_handlers = []
         self.on_msg(self._handle_button_msg)
 
 
     def on_click(self, callback, remove=False):
         """Register a callback to execute when the button is clicked.  The
         callback can either accept no parameters or one sender parameter:
         - callback()
         - callback(sender)
         If the callback has a sender parameter, the ButtonWidget instance that
         called the callback will be passed into the method as the sender.
 
         Parameters
         ----------
         remove : bool (optional)
             Set to true to remove the callback from the list of callbacks."""
         if remove:
             self._click_handlers.remove(callback)
         elif not callback in self._click_handlers:
             self._click_handlers.append(callback)
 
 
     def _handle_button_msg(self, content):
         """Handle a msg from the front-end
 
         Parameters
         ----------
         content: dict
             Content of the msg."""
         if 'event' in content and content['event'] == 'click':
             self._handle_click()
 
 
     def _handle_click(self):
         """Handles when the button has been clicked.  Fires on_click
         callbacks when appropriate."""
         
         for handler in self._click_handlers:
             if callable(handler):
                 argspec = inspect.getargspec(handler)
                 nargs = len(argspec[0])
 
                 # Bound methods have an additional 'self' argument
                 if isinstance(handler, types.MethodType):
                     nargs -= 1
 
                 # Call the callback
                 if nargs == 0:
                     handler()
                 elif nargs == 1:
                     handler(self)
                 else:
                     raise TypeError('ButtonWidget click callback must ' \
                         'accept 0 or 1 arguments.')
         

IPython/html/widgets/widget_float.py

@@ -1,28 +1,28 b''
 """FloatWidget class.  
 
 Represents an unbounded float using a widget.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Float, Bool, List
+from IPython.utils.traitlets import Unicode, CFloat, Bool, List
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class FloatTextWidget(DOMWidget):
     view_name = Unicode('FloatTextView', sync=True)
 
     # Keys
-    value = Float(0.0, help="Float value", sync=True) 
+    value = CFloat(0.0, help="Float value", sync=True) 
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)

IPython/html/widgets/widget_float_range.py

@@ -1,38 +1,38 b''
 """FloatRangeWidget class.  
 
 Represents a bounded float using a widget.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Float, Bool, List
+from IPython.utils.traitlets import Unicode, CFloat, Bool, List
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class BoundedFloatTextWidget(DOMWidget):
     view_name = Unicode('FloatTextView', sync=True)
-    value = Float(0.0, help="Float value", sync=True) 
-    max = Float(100.0, help="Max value", sync=True)
-    min = Float(0.0, help="Min value", sync=True)
+    value = CFloat(0.0, help="Float value", sync=True) 
+    max = CFloat(100.0, help="Max value", sync=True)
+    min = CFloat(0.0, help="Min value", sync=True)
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
-    step = Float(0.1, help="Minimum step that the value can take (ignored by some views)", sync=True)
+    step = CFloat(0.1, help="Minimum step that the value can take (ignored by some views)", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
 
 
 class FloatSliderWidget(BoundedFloatTextWidget):
     view_name = Unicode('FloatSliderView', sync=True)
     orientation = Unicode(u'horizontal', help="Vertical or horizontal.", sync=True)
 
 
 class FloatProgressWidget(BoundedFloatTextWidget):
     view_name = Unicode('ProgressView', sync=True)

IPython/html/widgets/widget_int.py

@@ -1,28 +1,28 b''
 """IntWidget class.  
 
 Represents an unbounded int using a widget.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Int, Bool, List
+from IPython.utils.traitlets import Unicode, CInt, Bool, List
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class IntTextWidget(DOMWidget):
     view_name = Unicode('IntTextView', sync=True)
 
     # Keys
-    value = Int(0, help="Int value", sync=True) 
+    value = CInt(0, help="Int value", sync=True) 
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)

IPython/html/widgets/widget_int_range.py

@@ -1,40 +1,40 b''
 """IntRangeWidget class.  
 
 Represents a bounded int using a widget.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Int, Bool, List
+from IPython.utils.traitlets import Unicode, CInt, Bool, List
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class BoundedIntTextWidget(DOMWidget):
     view_name = Unicode('IntTextView', sync=True)
 
     # Keys
-    value = Int(0, help="Int value", sync=True) 
-    max = Int(100, help="Max value", sync=True)
-    min = Int(0, help="Min value", sync=True)
+    value = CInt(0, help="Int value", sync=True) 
+    max = CInt(100, help="Max value", sync=True)
+    min = CInt(0, help="Min value", sync=True)
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
-    step = Int(1, help="Minimum step that the value can take (ignored by some views)", sync=True)
+    step = CInt(1, help="Minimum step that the value can take (ignored by some views)", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
 
 
 class IntSliderWidget(BoundedIntTextWidget):
     view_name = Unicode('IntSliderView', sync=True)
     orientation = Unicode(u'horizontal', help="Vertical or horizontal.", sync=True)
 
 
 class IntProgressWidget(BoundedIntTextWidget):
     view_name = Unicode('ProgressView', sync=True)

IPython/html/widgets/widget_selectioncontainer.py

@@ -1,60 +1,60 b''
 """SelectionContainerWidget class.  
 
 Represents a multipage container that can be used to group other widgets into
 pages.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Dict, Int, List, Instance
+from IPython.utils.traitlets import Unicode, Dict, CInt, List, Instance
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class AccordionWidget(DOMWidget):
     view_name = Unicode('AccordionView', sync=True)
 
     # Keys
     _titles = Dict(help="Titles of the pages", sync=True)
-    selected_index = Int(0, sync=True)
+    selected_index = CInt(0, sync=True)
 
     children = List(Instance(DOMWidget), sync=True)
 
     # Public methods
     def set_title(self, index, title):
         """Sets the title of a container page
 
         Parameters
         ----------
         index : int
             Index of the container page
         title : unicode
             New title"""
         self._titles[index] = title
         self.send_state('_titles')
 
 
     def get_title(self, index):
         """Gets the title of a container pages
 
         Parameters
         ----------
         index : int
             Index of the container page"""
         if index in self._titles:
             return self._titles[index]
         else:
             return None
 
 
 class TabWidget(AccordionWidget):
     view_name = Unicode('TabView', sync=True)

IPython/html/widgets/widget_string.py

@@ -1,94 +1,94 b''
 """StringWidget class.  
 
 Represents a unicode string using a widget.
 """
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013, the IPython Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
 import inspect
 import types
 
 from .widget import DOMWidget
-from IPython.utils.traitlets import Unicode, Bool, List, Int
+from IPython.utils.traitlets import Unicode, Bool, List
 
 #-----------------------------------------------------------------------------
 # Classes
 #-----------------------------------------------------------------------------
 class HTMLWidget(DOMWidget):
     view_name = Unicode('HTMLView', sync=True)
 
     # Keys
     value = Unicode(help="String value", sync=True)
     disabled = Bool(False, help="Enable or disable user changes", sync=True)
     description = Unicode(help="Description of the value this widget represents", sync=True)
 
 
 class LatexWidget(HTMLWidget):
     view_name = Unicode('LatexView', sync=True)
 
 
 class TextAreaWidget(HTMLWidget):
     view_name = Unicode('TextAreaView', sync=True)
 
     def scroll_to_bottom(self):
         self.send({"method": "scroll_to_bottom"})
 
 
 class TextBoxWidget(HTMLWidget):
     view_name = Unicode('TextBoxView', sync=True)
 
     def __init__(self, **kwargs):
         super(TextBoxWidget, self).__init__(**kwargs)
         self._submission_callbacks = []        
         self.on_msg(self._handle_string_msg)
 
     def _handle_string_msg(self, content):
         """Handle a msg from the front-end
 
         Parameters
         ----------
         content: dict
             Content of the msg."""
         if 'event' in content and content['event'] == 'submit':
             for handler in self._submission_callbacks:
                 handler(self)
 
     def on_submit(self, callback, remove=False):
         """Register a callback to handle text submission (triggered when the 
         user clicks enter).
 
         Parameters
         callback: Method handle
             Function to be called when the text has been submitted.  Function
             can have two possible signatures:
             callback()
             callback(sender)
         remove: bool (optional)
             Whether or not to unregister the callback"""
         if remove and callback in self._submission_callbacks:
             self._submission_callbacks.remove(callback)
         elif not remove and not callback in self._submission_callbacks:
             if callable(callback):
                 argspec = inspect.getargspec(callback)
                 nargs = len(argspec[0])
 
                 # Bound methods have an additional 'self' argument
                 if isinstance(callback, types.MethodType):
                     nargs -= 1
 
                 # Call the callback
                 if nargs == 0:
                     self._submission_callbacks.append(lambda sender: callback())
                 elif nargs == 1:
                     self._submission_callbacks.append(callback)
                 else:
                     raise TypeError('TextBoxWidget submit callback must ' \
                         'accept 0 or 1 arguments.')