edit relevant classes and write _enforce_bool_type function

Author: rforgione

pandas/computation/eval.py

@@ -11,6 +11,7 @@
 from pandas.computation.scope import _ensure_scope
 from pandas.compat import string_types
 from pandas.computation.engines import _engines
+from pandas.core import common as com
 
 
 def _check_engine(engine):
@@ -231,6 +232,7 @@ def eval(expr, parser='pandas', engine=None, truediv=True,
     pandas.DataFrame.query
     pandas.DataFrame.eval
     """
+    inplace = com.enforce_bool_type(inplace)
     first_expr = True
     if isinstance(expr, string_types):
         exprs = [e for e in expr.splitlines() if e != '']

pandas/core/base.py

@@ -1177,6 +1177,7 @@ def searchsorted(self, key, 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)
         if isinstance(self, ABCIndexClass):
             if self.is_unique:
                 return self._shallow_copy()

pandas/core/common.py

@@ -205,6 +205,13 @@ def is_bool_indexer(key):
     return False
 
 
+def _enforce_bool_type(value):
+    if not isinstance(value, bool):
+        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

@@ -61,7 +61,8 @@
                                 _default_index,
                                 _values_from_object,
                                 _maybe_box_datetimelike,
-                                _dict_compat)
+                                _dict_compat,
+                                _enforce_bool_type)
 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,
@@ -2199,6 +2200,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)
         if not isinstance(expr, compat.string_types):
             msg = "expr must be a string to be evaluated, {0} given"
             raise ValueError(msg.format(type(expr)))
@@ -2265,6 +2267,7 @@ def eval(self, expr, inplace=None, **kwargs):
         >>> df.eval('a + b')
         >>> df.eval('c = a + b')
         """
+        inplace = _enforce_bool_type(inplace)
         resolvers = kwargs.pop('resolvers', None)
         kwargs['level'] = kwargs.pop('level', 0) + 1
         if resolvers is None:
@@ -2857,6 +2860,7 @@ def set_index(self, keys, drop=True, append=False, inplace=False,
         -------
         dataframe : DataFrame
         """
+        inplace = _enforce_bool_type(inplace)
         if not isinstance(keys, list):
             keys = [keys]
 
@@ -2949,6 +2953,7 @@ def reset_index(self, level=None, drop=False, inplace=False, col_level=0,
         -------
         resetted : DataFrame
         """
+        inplace = _enforce_bool_type(inplace)
         if inplace:
             new_obj = self
         else:
@@ -3053,6 +3058,7 @@ def dropna(self, axis=0, how='any', thresh=None, subset=None,
         -------
         dropped : DataFrame
         """
+        inplace = _enforce_bool_type(inplace)
         if isinstance(axis, (tuple, list)):
             result = self
             for ax in axis:
@@ -3116,6 +3122,7 @@ def drop_duplicates(self, subset=None, keep='first', inplace=False):
         -------
         deduplicated : DataFrame
         """
+        inplace = _enforce_bool_type(inplace)
         duplicated = self.duplicated(subset, keep=keep)
 
         if inplace:
@@ -3177,7 +3184,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)
         axis = self._get_axis_number(axis)
         other_axis = 0 if axis == 1 else 1
 
@@ -3288,7 +3295,7 @@ def sort(self, columns=None, axis=0, ascending=True, inplace=False,
     def sort_index(self, axis=0, level=None, ascending=True, inplace=False,
                    kind='quicksort', na_position='last', sort_remaining=True,
                    by=None):
-
+        inplace = _enforce_bool_type(inplace)
         # 10726
         if by is not None:
             warnings.warn("by argument to sort_index is deprecated, pls use "

pandas/core/generic.py

@@ -30,7 +30,8 @@
 from pandas.core.common import (_values_from_object,
                                 _maybe_box_datetimelike,
                                 SettingWithCopyError, SettingWithCopyWarning,
-                                AbstractMethodError)
+                                AbstractMethodError,
+                                _enforce_bool_type)
 
 from pandas.core.base import PandasObject
 from pandas.core.index import (Index, MultiIndex, _ensure_index,
@@ -732,6 +733,7 @@ def rename_axis(self, mapper, axis=0, copy=True, inplace=False):
         1    2  5
         2    3  6
         """
+        inplace = _enforce_bool_type(inplace)
         non_mapper = is_scalar(mapper) or (is_list_like(mapper) and not
                                            is_dict_like(mapper))
         if non_mapper:
@@ -1893,6 +1895,7 @@ def drop(self, labels, axis=0, level=None, inplace=False, errors='raise'):
         -------
         dropped : type of caller
         """
+        inplace = _enforce_bool_type(inplace)
         axis = self._get_axis_number(axis)
         axis_name = self._get_axis_name(axis)
         axis, axis_ = self._get_axis(axis), axis
@@ -2041,6 +2044,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)
         axis = self._get_axis_number(axis)
         axis_name = self._get_axis_name(axis)
         labels = self._get_axis(axis)
@@ -2221,7 +2225,7 @@ def sort_index(self, axis=0, level=None, ascending=True, inplace=False,
     #       kinds
 
     @Appender(_shared_docs['reindex'] % dict(axes="axes", klass="NDFrame"))
-    def reindex(self, *args, **kwargs):
+        def reindex(self, *args, **kwargs):
 
         # construct the args
         axes, kwargs = self._construct_axes_from_arguments(args, kwargs)
@@ -2814,6 +2818,7 @@ def consolidate(self, inplace=False):
         -------
         consolidated : type of caller
         """
+        inplace = _enforce_bool_type(inplace)
         if inplace:
             self._consolidate_inplace()
         else:
@@ -3199,6 +3204,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)
         if isinstance(value, (list, tuple)):
             raise TypeError('"value" parameter must be a scalar or dict, but '
                             'you passed a "{0}"'.format(type(value).__name__))
@@ -3407,6 +3413,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)
         if not is_bool(regex) and to_replace is not None:
             raise AssertionError("'to_replace' must be 'None' if 'regex' is "
                                  "not a bool")
@@ -3632,6 +3639,7 @@ def interpolate(self, method='linear', axis=0, limit=None, inplace=False,
         """
         Interpolate values according to different methods.
         """
+        inplace = _enforce_bool_type(inplace)
 
         if self.ndim > 2:
             raise NotImplementedError("Interpolate has not been implemented "
@@ -4511,6 +4519,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)
 
         cond = com._apply_if_callable(cond, self)
 
@@ -4778,6 +4787,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)
         cond = com._apply_if_callable(cond, self)
 
         return self.where(~cond, other=other, inplace=inplace, axis=axis,

pandas/core/internals.py

@@ -43,7 +43,7 @@
 import pandas.types.concat as _concat
 
 from pandas.types.generic import ABCSeries
-from pandas.core.common import is_null_slice
+from pandas.core.common import is_null_slice, _enforce_bool_type
 import pandas.core.algorithms as algos
 
 from pandas.core.index import Index, MultiIndex, _ensure_index
@@ -361,6 +361,7 @@ def fillna(self, value, limit=None, inplace=False, downcast=None,
         """ fillna on the block with the value. If we fail, then convert to
         ObjectBlock and try again
         """
+        inplace = com.enforce_bool_type(inplace)
 
         if not self._can_hold_na:
             if inplace:
@@ -621,6 +622,7 @@ def replace(self, to_replace, value, inplace=False, filter=None,
         compatibility.
         """
 
+        inplace = com.enforce_bool_type(inplace)
         original_to_replace = to_replace
         mask = isnull(self.values)
 
@@ -893,6 +895,9 @@ def interpolate(self, method='pad', axis=0, index=None, values=None,
                     inplace=False, limit=None, limit_direction='forward',
                     fill_value=None, coerce=False, downcast=None, mgr=None,
                     **kwargs):
+
+        inplace = com.enforce_bool_type(inplace)
+
         def check_int_bool(self, inplace):
             # Only FloatBlocks will contain NaNs.
             # timedelta subclasses IntBlock
@@ -940,6 +945,8 @@ def _interpolate_with_fill(self, method='pad', axis=0, inplace=False,
                                downcast=None, mgr=None):
         """ fillna but using the interpolate machinery """
 
+        inplace = com.enforce_bool_type(inplace)
+
         # if we are coercing, then don't force the conversion
         # if the block can't hold the type
         if coerce:
@@ -966,6 +973,7 @@ def _interpolate(self, method=None, index=None, values=None,
                      mgr=None, **kwargs):
         """ interpolate using scipy wrappers """
 
+        inplace = com.enforce_bool_type(inplace)
         data = self.values if inplace else self.values.copy()
 
         # only deal with floats
@@ -1487,6 +1495,7 @@ def putmask(self, mask, new, align=True, inplace=False, axis=0,
         -------
         a new block(s), the result of the putmask
         """
+        inplace = com.enforce_bool_type(inplace)
 
         # use block's copy logic.
         # .values may be an Index which does shallow copy by default
@@ -1774,6 +1783,7 @@ def should_store(self, value):
 
     def replace(self, to_replace, value, inplace=False, filter=None,
                 regex=False, mgr=None):
+        inplace = com.enforce_bool_type(inplace)
         to_replace_values = np.atleast_1d(to_replace)
         if not np.can_cast(to_replace_values, bool):
             return self
@@ -1954,6 +1964,9 @@ def replace(self, to_replace, value, inplace=False, filter=None,
 
     def _replace_single(self, to_replace, value, inplace=False, filter=None,
                         regex=False, convert=True, mgr=None):
+
+        inplace = com.enforce_bool_type(inplace)
+
         # to_replace is regex compilable
         to_rep_re = regex and is_re_compilable(to_replace)
 
@@ -3177,6 +3190,8 @@ def replace_list(self, src_list, dest_list, inplace=False, regex=False,
                      mgr=None):
         """ do a list replace """
 
+        inplace = com.enforce_bool_type(inplace)
+
         if mgr is None:
             mgr = self
 

pandas/core/series.py

@@ -40,7 +40,8 @@
                                 _maybe_match_name,
                                 SettingWithCopyError,
                                 _maybe_box_datetimelike,
-                                _dict_compat)
+                                _dict_compat,
+                                _enforce_bool_type)
 from pandas.core.index import (Index, MultiIndex, InvalidIndexError,
                                Float64Index, _ensure_index)
 from pandas.core.indexing import check_bool_indexer, maybe_convert_indices
@@ -971,6 +972,7 @@ def reset_index(self, level=None, drop=False, name=None, inplace=False):
         ----------
         resetted : DataFrame, or Series if drop == True
         """
+        inplace = _enforce_bool_type(inplace)
         if drop:
             new_index = _default_index(len(self))
             if level is not None and isinstance(self.index, MultiIndex):
@@ -1171,6 +1173,7 @@ def _set_name(self, name, inplace=False):
         inplace : bool
             whether to modify `self` directly or return a copy
         """
+        inplace = _enforce_bool_type(inplace)
         ser = self if inplace else self.copy()
         ser.name = name
         return ser
@@ -1723,6 +1726,7 @@ def update(self, other):
     def sort_values(self, axis=0, ascending=True, inplace=False,
                     kind='quicksort', na_position='last'):
 
+        inplace = _enforce_bool_type(inplace)
         axis = self._get_axis_number(axis)
 
         # GH 5856/5853
@@ -1775,6 +1779,7 @@ def _try_kind_sort(arr):
     def sort_index(self, axis=0, level=None, ascending=True, inplace=False,
                    sort_remaining=True):
 
+        inplace = _enforce_bool_type(inplace)
         axis = self._get_axis_number(axis)
         index = self.index
         if level is not None:
@@ -2349,6 +2354,7 @@ def align(self, other, join='outer', axis=None, level=None, copy=True,
 
     @Appender(generic._shared_docs['rename'] % _shared_doc_kwargs)
     def rename(self, index=None, **kwargs):
+        kwargs['inplace'] = _enforce_bool_type(kwargs['inplace'])
         non_mapping = is_scalar(index) or (is_list_like(index) and
                                            not is_dict_like(index))
         if non_mapping:
@@ -2632,6 +2638,7 @@ def dropna(self, axis=0, inplace=False, **kwargs):
         inplace : boolean, default False
             Do operation in place.
         """
+        inplace = _enforce_bool_type(inplace)
         kwargs.pop('how', None)
         if kwargs:
             raise TypeError('dropna() got an unexpected keyword '

pandas/sparse/list.py

@@ -4,6 +4,7 @@
 from pandas.formats.printing import pprint_thing
 
 from pandas.types.common import is_scalar
+from pands.core.common import _enforce_bool_type
 from pandas.sparse.array import SparseArray
 import pandas._sparse as splib
 
@@ -78,6 +79,7 @@ def consolidate(self, inplace=True):
             If inplace=False, new object, otherwise reference to existing
             object
         """
+        inplace = com.enforce_bool_type(inplace)
         if not inplace:
             result = self.copy()
         else: