mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up validation in __init__

Browse Source
This commit is contained in:
Gordon Ball 2014-08-24 12:26:56 +02:00
parent a096d01310
commit 9383822d7a
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IPython/html/widgets/widget_float.py
View File

@ -68,10 +68,13 @@ class _FloatRange(_Float):
upper = CFloat(1.0, help="Upper bound", sync=False)
def __init__(self, *pargs, **kwargs):
if 'value' in kwargs and ('lower' in kwargs or 'upper' in kwargs):
raise ValueError("Cannot specify both 'value' and 'lower'/'upper' for range widget")
value_given = 'value' in kwargs
lower_given = 'lower' in kwargs
upper_given = 'upper' in kwargs
if value_given and (lower_given or upper_given):
raise ValueError("Cannot specify both 'value' and 'lower'/'upper' for range widget")
if lower_given != upper_given:
raise ValueError("Must specify both 'lower' and 'upper' for range widget")
DOMWidget.__init__(self, *pargs, **kwargs)
@ -104,15 +107,11 @@ class _BoundedFloatRange(_FloatRange):
if self.min > self.max:
raise ValueError("min must be <= max")
# ensure the initial values within bounds
if self.lower < self.min:
self.lower = self.min
if self.upper > self.max:
self.upper = self.max
# if no value is set, use 25-75% to avoid the handles overlapping
if not any_value_given:
if any_value_given:
# if a value was given, clamp it within (min, max)
self._validate("value", None, self.value)
else:
# otherwise, set it to 25-75% to avoid the handles overlapping
self.value = (0.75*self.min + 0.25*self.max,
0.25*self.min + 0.75*self.max)
# callback already set for 'value', 'lower', 'upper'

23
IPython/html/widgets/widget_int.py
View File

@ -74,10 +74,13 @@ class _IntRange(_Int):
upper = CInt(1, help="Upper bound", sync=False)
def __init__(self, *pargs, **kwargs):
if 'value' in kwargs and ('lower' in kwargs or 'upper' in kwargs):
raise ValueError("Cannot specify both 'value' and 'lower'/'upper' for range widget")
value_given = 'value' in kwargs
lower_given = 'lower' in kwargs
upper_given = 'upper' in kwargs
if value_given and (lower_given or upper_given):
raise ValueError("Cannot specify both 'value' and 'lower'/'upper' for range widget")
if lower_given != upper_given:
raise ValueError("Must specify both 'lower' and 'upper' for range widget")
DOMWidget.__init__(self, *pargs, **kwargs)
@ -110,15 +113,11 @@ class _BoundedIntRange(_IntRange):
if self.min > self.max:
raise ValueError("min must be <= max")
# ensure the initial values within bounds
if self.lower < self.min:
self.lower = self.min
if self.upper > self.max:
self.upper = self.max
# if no value (or upper/lower) is set, use 25-75% to avoid the handles overlapping
if not any_value_given:
if any_value_given:
# if a value was given, clamp it within (min, max)
self._validate("value", None, self.value)
else:
# otherwise, set it to 25-75% to avoid the handles overlapping
self.value = (0.75*self.min + 0.25*self.max,
0.25*self.min + 0.75*self.max)
# callback already set for 'value', 'lower', 'upper'