move validation function into pandas.types.validate and point all instances there

Author: rforgione

pandas/computation/eval.py

@@ -12,6 +12,7 @@
 from pandas.compat import string_types
 from pandas.computation.engines import _engines
 from pandas.core import common as com
+from pandas.types.validate import _validate_bool_type
 
 
 def _check_engine(engine):
@@ -228,7 +229,7 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
     pandas.DataFrame.query
     pandas.DataFrame.eval
     """
-    inplace = com._enforce_bool_type(inplace)
+    inplace = _validate_bool_type(inplace)
     first_expr = True
     if isinstance(expr, string_types):
         _check_expression(expr)

pandas/core/base.py

@@ -8,6 +8,7 @@
 from pandas.types.missing import isnull
 from pandas.types.generic import ABCDataFrame, ABCSeries, ABCIndexClass
 from pandas.types.common import is_object_dtype, is_list_like, is_scalar
+from pandas.types.validate import _validate_bool_type
 
 from pandas.core import common as com
 import pandas.core.nanops as nanops
@@ -1178,7 +1179,7 @@ def searchsorted(self, value, side='left', sorter=None):
                                                    False: 'first'})
     @Appender(_shared_docs['drop_duplicates'] % _indexops_doc_kwargs)
     def drop_duplicates(self, keep='first', inplace=False):
-        inplace = com._enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if isinstance(self, ABCIndexClass):
             if self.is_unique:
                 return self._shallow_copy()

pandas/core/categorical.py

@@ -23,7 +23,8 @@
                                  is_integer_dtype, is_bool,
                                  is_list_like, is_sequence,
                                  is_scalar)
-from pandas.core.common import is_null_slice, _enforce_bool_type
+from pandas.types.validate import _validate_bool_type
+from pandas.core.common import is_null_slice
 
 from pandas.core.algorithms import factorize, take_1d
 from pandas.core.base import (PandasObject, PandasDelegate,
@@ -615,7 +616,7 @@ def set_ordered(self, value, inplace=False):
            Whether or not to set the ordered attribute inplace or return a copy
            of this categorical with ordered set to the value
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         self._validate_ordered(value)
         cat = self if inplace else self.copy()
         cat._ordered = value
@@ -632,7 +633,7 @@ def as_ordered(self, inplace=False):
            Whether or not to set the ordered attribute inplace or return a copy
            of this categorical with ordered set to True
         """
-        return self.set_ordered(True, inplace=_enforce_bool_type(inplace))
+        return self.set_ordered(True, inplace=_validate_bool_type(inplace))
 
     def as_unordered(self, inplace=False):
         """
@@ -644,7 +645,7 @@ def as_unordered(self, inplace=False):
            Whether or not to set the ordered attribute inplace or return a copy
            of this categorical with ordered set to False
         """
-        return self.set_ordered(False, inplace=_enforce_bool_type(inplace))
+        return self.set_ordered(False, inplace=_validate_bool_type(inplace))
 
     def _get_ordered(self):
         """ Gets the ordered attribute """
@@ -703,7 +704,7 @@ def set_categories(self, new_categories, ordered=None, rename=False,
         remove_categories
         remove_unused_categories
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         new_categories = self._validate_categories(new_categories)
         cat = self if inplace else self.copy()
         if rename:
@@ -756,7 +757,7 @@ def rename_categories(self, new_categories, inplace=False):
         remove_unused_categories
         set_categories
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         cat = self if inplace else self.copy()
         cat.categories = new_categories
         if not inplace:
@@ -797,7 +798,7 @@ def reorder_categories(self, new_categories, ordered=None, inplace=False):
         remove_unused_categories
         set_categories
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if set(self._categories) != set(new_categories):
             raise ValueError("items in new_categories are not the same as in "
                              "old categories")
@@ -836,7 +837,7 @@ def add_categories(self, new_categories, inplace=False):
         remove_unused_categories
         set_categories
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if not is_list_like(new_categories):
             new_categories = [new_categories]
         already_included = set(new_categories) & set(self._categories)
@@ -882,7 +883,7 @@ def remove_categories(self, removals, inplace=False):
         remove_unused_categories
         set_categories
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if not is_list_like(removals):
             removals = [removals]
 
@@ -923,7 +924,7 @@ def remove_unused_categories(self, inplace=False):
         remove_categories
         set_categories
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         cat = self if inplace else self.copy()
         idx, inv = np.unique(cat._codes, return_inverse=True)
 
@@ -1324,7 +1325,7 @@ def sort_values(self, inplace=False, ascending=True, na_position='last'):
         [NaN, NaN, 5.0, 2.0, 2.0]
         Categories (2, int64): [2, 5]
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if na_position not in ['last', 'first']:
             raise ValueError('invalid na_position: {!r}'.format(na_position))
 

pandas/core/common.py

@@ -214,13 +214,6 @@ def is_bool_indexer(key):
     return False
 
 
-def _enforce_bool_type(value):
-    if not is_bool(value):
-        raise ValueError('Expected type bool, received type %s.' %\
-            type(value).__name__)
-    return value
-
-
 def _default_index(n):
     from pandas.core.index import RangeIndex
     return RangeIndex(0, n, name=None)

pandas/core/frame.py

@@ -56,13 +56,13 @@
                                  is_sequence,
                                  is_named_tuple)
 from pandas.types.missing import isnull, notnull
+from pandas.types.validate import _validate_bool_type
 
 from pandas.core.common import (PandasError, _try_sort,
                                 _default_index,
                                 _values_from_object,
                                 _maybe_box_datetimelike,
-                                _dict_compat,
-                                _enforce_bool_type)
+                                _dict_compat)
 from pandas.core.generic import NDFrame, _shared_docs
 from pandas.core.index import Index, MultiIndex, _ensure_index
 from pandas.core.indexing import (maybe_droplevels, convert_to_index_sliceable,
@@ -2203,7 +2203,7 @@ def query(self, expr, inplace=False, **kwargs):
         >>> df.query('a > b')
         >>> df[df.a > df.b]  # same result as the previous expression
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if not isinstance(expr, compat.string_types):
             msg = "expr must be a string to be evaluated, {0} given"
             raise ValueError(msg.format(type(expr)))
@@ -2266,7 +2266,7 @@ def eval(self, expr, inplace=True, **kwargs):
         >>> df.eval('a + b')
         >>> df.eval('c = a + b')
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         resolvers = kwargs.pop('resolvers', None)
         kwargs['level'] = kwargs.pop('level', 0) + 1
         if resolvers is None:
@@ -2875,7 +2875,7 @@ def set_index(self, keys, drop=True, append=False, inplace=False,
         -------
         dataframe : DataFrame
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if not isinstance(keys, list):
             keys = [keys]
 
@@ -2968,7 +2968,7 @@ def reset_index(self, level=None, drop=False, inplace=False, col_level=0,
         -------
         resetted : DataFrame
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if inplace:
             new_obj = self
         else:
@@ -3073,7 +3073,7 @@ def dropna(self, axis=0, how='any', thresh=None, subset=None,
         -------
         dropped : DataFrame
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if isinstance(axis, (tuple, list)):
             result = self
             for ax in axis:
@@ -3137,7 +3137,7 @@ def drop_duplicates(self, subset=None, keep='first', inplace=False):
         -------
         deduplicated : DataFrame
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         duplicated = self.duplicated(subset, keep=keep)
 
         if inplace:
@@ -3199,7 +3199,7 @@ def f(vals):
     @Appender(_shared_docs['sort_values'] % _shared_doc_kwargs)
     def sort_values(self, by, axis=0, ascending=True, inplace=False,
                     kind='quicksort', na_position='last'):
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         axis = self._get_axis_number(axis)
         other_axis = 0 if axis == 1 else 1
 
@@ -3292,7 +3292,7 @@ def sort(self, columns=None, axis=0, ascending=True, inplace=False,
         -------
         sorted : DataFrame
         """
-        nv.validate_sort(tuple(), kwargs)
+        # nv.validate_sort(tuple(), kwargs)
 
         if columns is None:
             warnings.warn("sort(....) is deprecated, use sort_index(.....)",

pandas/core/generic.py

@@ -27,12 +27,12 @@
 from pandas.types.cast import _maybe_promote, _maybe_upcast_putmask
 from pandas.types.missing import isnull, notnull
 from pandas.types.generic import ABCSeries, ABCPanel
+from pandas.types.validate import _validate_bool_type
 
 from pandas.core.common import (_values_from_object,
                                 _maybe_box_datetimelike,
                                 SettingWithCopyError, SettingWithCopyWarning,
-                                AbstractMethodError,
-                                _enforce_bool_type)
+                                AbstractMethodError)
 
 from pandas.core.base import PandasObject
 from pandas.core.index import (Index, MultiIndex, _ensure_index,
@@ -734,7 +734,7 @@ def rename_axis(self, mapper, axis=0, copy=True, inplace=False):
         1    2  5
         2    3  6
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         non_mapper = is_scalar(mapper) or (is_list_like(mapper) and not
                                            is_dict_like(mapper))
         if non_mapper:
@@ -1896,7 +1896,7 @@ def drop(self, labels, axis=0, level=None, inplace=False, errors='raise'):
         -------
         dropped : type of caller
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         axis = self._get_axis_number(axis)
         axis_name = self._get_axis_name(axis)
         axis, axis_ = self._get_axis(axis), axis
@@ -2045,7 +2045,7 @@ def sort_values(self, by, axis=0, ascending=True, inplace=False,
     @Appender(_shared_docs['sort_index'] % dict(axes="axes", klass="NDFrame"))
     def sort_index(self, axis=0, level=None, ascending=True, inplace=False,
                    kind='quicksort', na_position='last', sort_remaining=True):
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         axis = self._get_axis_number(axis)
         axis_name = self._get_axis_name(axis)
         labels = self._get_axis(axis)
@@ -2819,7 +2819,7 @@ def consolidate(self, inplace=False):
         -------
         consolidated : type of caller
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if inplace:
             self._consolidate_inplace()
         else:
@@ -3205,7 +3205,7 @@ def convert_objects(self, convert_dates=True, convert_numeric=False,
     @Appender(_shared_docs['fillna'] % _shared_doc_kwargs)
     def fillna(self, value=None, method=None, axis=None, inplace=False,
                limit=None, downcast=None):
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if isinstance(value, (list, tuple)):
             raise TypeError('"value" parameter must be a scalar or dict, but '
                             'you passed a "{0}"'.format(type(value).__name__))
@@ -3414,7 +3414,7 @@ def replace(self, to_replace=None, value=None, inplace=False, limit=None,
           and play with this method to gain intuition about how it works.
 
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         if not is_bool(regex) and to_replace is not None:
             raise AssertionError("'to_replace' must be 'None' if 'regex' is "
                                  "not a bool")
@@ -3647,7 +3647,7 @@ def interpolate(self, method='linear', axis=0, limit=None, inplace=False,
         """
         Interpolate values according to different methods.
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
 
         if self.ndim > 2:
             raise NotImplementedError("Interpolate has not been implemented "
@@ -4558,7 +4558,7 @@ def _where(self, cond, other=np.nan, inplace=False, axis=None, level=None,
         Equivalent to public method `where`, except that `other` is not
         applied as a function even if callable. Used in __setitem__.
         """
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
 
         cond = com._apply_if_callable(cond, self)
 
@@ -4826,7 +4826,7 @@ def where(self, cond, other=np.nan, inplace=False, axis=None, level=None,
     def mask(self, cond, other=np.nan, inplace=False, axis=None, level=None,
              try_cast=False, raise_on_error=True):
 
-        inplace = _enforce_bool_type(inplace)
+        inplace = _validate_bool_type(inplace)
         cond = com._apply_if_callable(cond, self)
 
         return self.where(~cond, other=other, inplace=inplace, axis=axis,