ENH: tweak error message for #1001

pandas-dev · Apr 9, 2012 · acfa20a · acfa20a
1 parent 8caedef
commit acfa20a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -1712,9 +1712,9 @@ def lookup(self, row_labels, col_labels):
             ridx = self.index.get_indexer(row_labels)
             cidx = self.columns.get_indexer(col_labels)
             if (ridx == -1).any():
-                raise ValueError("Bad row label(s)")
+                raise ValueError('One or more row labels was not found')
             if (cidx == -1).any():
-                raise ValueError("Bad col label(s)")
+                raise ValueError('One or more column labels was not found')
             flat_index = ridx * len(self.columns) + cidx
             result = values.flat[flat_index]
         else:

diff --git a/pandas/tests/test_frame.py b/pandas/tests/test_frame.py
@@ -882,10 +882,10 @@ def testit(df):
         assert_almost_equal(df['mask'], exp_mask)
         self.assert_(df['mask'].dtype == np.bool_)
 
-        self.assertRaises(ValueError, self.frame.lookup, 
+        self.assertRaises(ValueError, self.frame.lookup,
                           ['xyz'], ['A'])
 
-        self.assertRaises(ValueError, self.frame.lookup, 
+        self.assertRaises(ValueError, self.frame.lookup,
                           [self.frame.index[0]], ['xyz'])
 
     def test_set_value(self):