ENH: pandas-dev#11897 make lint work. ERR: pandas-dev#14491 change error message

Author: Dr-Irv

pandas/core/indexing.py

@@ -1814,7 +1814,7 @@ def check_bool_indexer(ax, key):
         result = result.reindex(ax)
         mask = isnull(result._values)
         if mask.any():
-            raise IndexingError('Unalignable boolean Series key provided')
+            raise IndexingError('Unalignable labels in boolean Series index')
         result = result.astype(bool)._values
     elif is_sparse(result):
         result = result.to_dense()

pandas/indexes/multi.py

@@ -44,9 +44,11 @@
                                  _index_shared_docs)
 import pandas.indexes.base as ibase
 
+
 class UnsortedIndexError(KeyError):
     pass
 
+
 class MultiIndex(Index):
     """
     A multi-level, or hierarchical, index object for pandas objects
@@ -1938,10 +1940,10 @@ def get_locs(self, tup):
 
         # must be lexsorted to at least as many levels
         if not self.is_lexsorted_for_tuple(tup):
-            raise UnsortedIndexError(
-                           'MultiIndex Slicing requires the index to be fully '
-                           'lexsorted tuple len ({0}), lexsort depth '
-                           '({1})'.format(len(tup), self.lexsort_depth))
+            raise UnsortedIndexError('MultiIndex Slicing requires the index '
+                                     'to be fully lexsorted tuple len ({0}), '
+                                     'lexsort depth ({1})'
+                                     .format(len(tup), self.lexsort_depth))
 
         # indexer
         # this is the list of all values that we want to select

pandas/tests/indexes/test_multi.py

@@ -2538,17 +2538,17 @@ def test_dropna(self):
             idx.dropna(how='xxx')
 
     def test_unsortedindex(self):
-        #GH 11897
-        mi = pd.MultiIndex.from_tuples([('z','a'),('x','a'),('y','b'),
-                                        ('x','b'),('y','a'),('z','b')], 
-                                        names=['one','two'])
-        df = pd.DataFrame([[i,10*i] for i in lrange(6)], index=mi, 
-                          columns=['one','two'])
+        # GH 11897
+        mi = pd.MultiIndex.from_tuples([('z', 'a'), ('x', 'a'), ('y', 'b'),
+                                        ('x', 'b'), ('y', 'a'), ('z', 'b')],
+                                       names=['one', 'two'])
+        df = pd.DataFrame([[i, 10 * i] for i in lrange(6)], index=mi,
+                          columns=['one', 'two'])
 
         with assertRaises(UnsortedIndexError):
-            df.loc(axis=0)['z',:]
+            df.loc(axis=0)['z', :]
         df.sort_index(inplace=True)
-        self.assertEqual(len(df.loc(axis=0)['z',:]), 2)
-        
+        self.assertEqual(len(df.loc(axis=0)['z', :]), 2)
+
         with assertRaises(KeyError):
-            df.loc(axis=0)['q',:]
+            df.loc(axis=0)['q', :]