Bounded Float and Int

traitlets/tests/test_traitlets.py

@@ -760,16 +760,16 @@ class OrTraitTest(TraitTestBase):
 
 class IntTrait(HasTraits):
 
-    value = Int(99)
+    value = Int(99, min=-100)
 
 class TestInt(TraitTestBase):
 
     obj = IntTrait()
     _default_value = 99
     _good_values   = [10, -10]
-    _bad_values    = ['ten', u'ten', [10], {'ten': 10},(10,), None, 1j,
+    _bad_values    = ['ten', u'ten', [10], {'ten': 10}, (10,), None, 1j,
                       10.1, -10.1, '10L', '-10L', '10.1', '-10.1', u'10L',
-                      u'-10L', u'10.1', u'-10.1',  '10', '-10', u'10', u'-10']
+                      u'-10L', u'10.1', u'-10.1',  '10', '-10', u'10', -200]
     if not py3compat.PY3:
         _bad_values.extend([long(10), long(-10), 10*sys.maxint, -10*sys.maxint])
 
@@ -822,17 +822,17 @@ def test_cast_small(self):
 
 class FloatTrait(HasTraits):
 
-    value = Float(99.0)
+    value = Float(99.0, max=200.0)
 
 class TestFloat(TraitTestBase):
 
     obj = FloatTrait()
 
     _default_value = 99.0
     _good_values   = [10, -10, 10.1, -10.1]
-    _bad_values    = ['ten', u'ten', [10], {'ten': 10},(10,), None,
+    _bad_values    = ['ten', u'ten', [10], {'ten': 10}, (10,), None,
                       1j, '10', '-10', '10L', '-10L', '10.1', '-10.1', u'10',
-                      u'-10', u'10L', u'-10L', u'10.1', u'-10.1']
+                      u'-10', u'10L', u'-10L', u'10.1', u'-10.1', 201.0]
     if not py3compat.PY3:
         _bad_values.extend([long(10), long(-10)])
 

traitlets/traitlets.py

@@ -1204,10 +1204,28 @@ class Int(TraitType):
     default_value = 0
     info_text = 'an int'
 
+    def __init__(self, default_value=NoDefaultSpecified,
+                 allow_none=None, **kwargs):
+        self.min = kwargs.pop('min', None)
+        self.max = kwargs.pop('max', None)
+        super(Int, self).__init__(default_value=default_value,
+                                  allow_none=allow_none, **kwargs)
+
     def validate(self, obj, value):
-        if isinstance(value, int):
-            return value
-        self.error(obj, value)
+        if not isinstance(value, int):
+            self.error(obj, value)
+        if self.max is not None and value > self.max:        
+            raise TraitError("The value of the '%s' trait of %s instance should "
+                             "not be greater than %s, but a value of %s was "
+                             "specified" % (self.name, class_of(obj),
+                                            self.max, value))
+        if self.min is not None and value < self.min:
+            raise TraitError("The value of the '%s' trait of %s instance should "
+                             "not be less than %s, but a value of %s was "
+                             "specified" % (self.name, class_of(obj), 
+                                            self.min, value))
+        return value
+
 
 class CInt(Int):
     """A casting version of the int trait."""
@@ -1274,12 +1292,24 @@ class Float(TraitType):
     default_value = 0.0
     info_text = 'a float'
 
+    def __init__(self, default_value=NoDefaultSpecified,
+                 allow_none=None, **kwargs):
+        self.min = kwargs.pop('min', -float('inf'))
+        self.max = kwargs.pop('max', float('inf'))
+        super(Float, self).__init__(default_value=default_value, 
+                                    allow_none=allow_none, **kwargs)
+
     def validate(self, obj, value):
-        if isinstance(value, float):
-            return value
         if isinstance(value, int):
-            return float(value)
-        self.error(obj, value)
+            value = float(value)
+        if not isinstance(value, float):
+            self.error(obj, value)
+        if value > self.max or value < self.min:
+            raise TraitError("The value of the '%s' trait of %s instance should "
+                             "be between %s and %s, but a value of %s was "
+                             "specified" % (self.name, class_of(obj),
+                                            self.min, self.max, value))
+        return value
 
 
 class CFloat(Float):
@@ -1518,7 +1548,7 @@ def __init__(self, trait=None, default_value=None, **metadata):
             self._trait = trait() if isinstance(trait, type) else trait
             self._trait.name = 'element'
         elif trait is not None:
-            raise TypeError("`trait` must be a Trait or None, got %s"%repr_type(trait))
+            raise TypeError("`trait` must be a Trait or None, got %s" % repr_type(trait))
 
         super(Container,self).__init__(klass=self.klass, args=args, **metadata)