Merge branch 'master' of https://github.com/pandas-dev/pandas into rmix

pandas/tests/indexing/common.py

@@ -187,13 +187,9 @@ def _eq(axis, obj, key1, key2):
                 rs = getattr(obj, method1).__getitem__(_axify(obj, key1, axis))
 
                 try:
-                    xp = self.get_result(
-                        obj=obj, method=method2, key=key2, axis=axis
-                    )
+                    xp = self.get_result(obj=obj, method=method2, key=key2, axis=axis)
                 except (KeyError, IndexError):
                     # TODO: why is this allowed?
-                    result = "no comp"
-                    _print(result)
                     return
 
                 if is_scalar(rs) and is_scalar(xp):

pandas/tests/indexing/test_iloc.py

@@ -135,8 +135,8 @@ def test_iloc_non_integer_raises(self, index, columns, index_vals, column_vals):
             df.iloc[index_vals, column_vals]
 
     def test_iloc_getitem_int(self):
+        # integer
         self.check_result(
-            "integer",
             "iloc",
             2,
             "iloc",
@@ -146,8 +146,8 @@ def test_iloc_getitem_int(self):
         )
 
     def test_iloc_getitem_neg_int(self):
+        # neg integer
         self.check_result(
-            "neg int",
             "iloc",
             -1,
             "iloc",
@@ -223,7 +223,6 @@ def test_iloc_getitem_neg_int_can_reach_first_index(self):
         tm.assert_series_equal(result, expected)
 
     def test_iloc_getitem_dups(self):
-
         # GH 6766
         df1 = DataFrame([{"A": None, "B": 1}, {"A": 2, "B": 2}])
         df2 = DataFrame([{"A": 3, "B": 3}, {"A": 4, "B": 4}])
@@ -238,9 +237,11 @@ def test_iloc_getitem_dups(self):
         tm.assert_series_equal(result, expected)
 
     def test_iloc_getitem_array(self):
+        # TODO: test something here?
         pass
 
     def test_iloc_getitem_bool(self):
+        # TODO: test something here?
         pass
 
     @pytest.mark.parametrize("index", [[True, False], [True, False, True, False]])
@@ -254,6 +255,7 @@ def test_iloc_getitem_bool_diff_len(self, index):
             _ = s.iloc[index]
 
     def test_iloc_getitem_slice(self):
+        # TODO: test something here?
         pass
 
     def test_iloc_getitem_slice_dups(self):

pandas/tests/indexing/test_loc.py

@@ -95,16 +95,12 @@ def test_loc_setitem_slice(self):
     def test_loc_getitem_int(self):
 
         # int label
-        self.check_result(
-            "int label", "loc", 2, "loc", 2, typs=["label"], fails=KeyError
-        )
+        self.check_result("loc", 2, "loc", 2, typs=["label"], fails=KeyError)
 
     def test_loc_getitem_label(self):
 
         # label
-        self.check_result(
-            "label", "loc", "c", "loc", "c", typs=["empty"], fails=KeyError
-        )
+        self.check_result("loc", "c", "loc", "c", typs=["empty"], fails=KeyError)
 
     def test_loc_getitem_label_out_of_range(self):
 
@@ -118,44 +114,22 @@ def test_loc_getitem_label_out_of_range(self):
             fails=KeyError,
         )
         self.check_result("loc", "f", "ix", "f", typs=["floats"], fails=KeyError)
+        self.check_result("loc", "f", "loc", "f", typs=["floats"], fails=KeyError)
         self.check_result(
-            "label range", "loc", "f", "loc", "f", typs=["floats"], fails=KeyError
-        )
-        self.check_result(
-            "label range",
-            "loc",
-            20,
-            "loc",
-            20,
-            typs=["ints", "uints", "mixed"],
-            fails=KeyError,
+            "loc", 20, "loc", 20, typs=["ints", "uints", "mixed"], fails=KeyError,
         )
-        self.check_result(
-            "label range", "loc", 20, "loc", 20, typs=["labels"], fails=TypeError
-        )
-        self.check_result(
-            "label range", "loc", 20, "loc", 20, typs=["ts"], axes=0, fails=TypeError
-        )
-        self.check_result(
-            "label range", "loc", 20, "loc", 20, typs=["floats"], axes=0, fails=KeyError
-        )
-        self.check_result("loc", 20, "ix", 20, typs=["labels"], fails=TypeError)
-        self.check_result("loc", 20, "ix", 20, typs=["ts"], axes=0, fails=TypeError)
-        self.check_result("loc", 20, "ix", 20, typs=["floats"], axes=0, fails=KeyError)
+        self.check_result("loc", 20, "loc", 20, typs=["labels"], fails=TypeError)
+        self.check_result("loc", 20, "loc", 20, typs=["ts"], axes=0, fails=TypeError)
+        self.check_result("loc", 20, "loc", 20, typs=["floats"], axes=0, fails=KeyError)
 
     def test_loc_getitem_label_list(self):
+        # TODO: test something here?
         # list of labels
         pass
 
     def test_loc_getitem_label_list_with_missing(self):
         self.check_result(
-            "list lbl",
-            "loc",
-            [0, 1, 2],
-            "loc",
-            [0, 1, 2],
-            typs=["empty"],
-            fails=KeyError,
+            "loc", [0, 1, 2], "loc", [0, 1, 2], typs=["empty"], fails=KeyError,
         )
         with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
             self.check_result(
@@ -214,12 +188,15 @@ def test_loc_getitem_label_list_fails(self):
         )
 
     def test_loc_getitem_label_array_like(self):
+        # TODO: test something?
         # array like
         pass
 
     def test_loc_getitem_bool(self):
         # boolean indexers
-        pass
+        b = [True, False, True, False]
+
+        self.check_result("loc", b, "loc", b, typs=["empty"], fails=IndexError)
 
     @pytest.mark.parametrize("index", [[True, False], [True, False, True, False]])
     def test_loc_getitem_bool_diff_len(self, index):
@@ -232,6 +209,7 @@ def test_loc_getitem_bool_diff_len(self, index):
             _ = s.loc[index]
 
     def test_loc_getitem_int_slice(self):
+        # TODO: test something here?
         pass
 
     def test_loc_to_fail(self):
@@ -335,6 +313,25 @@ def test_loc_getitem_label_slice(self):
 
         # GH 14316
 
+        self.check_result(
+            "loc",
+            slice(1, 3),
+            "loc",
+            slice(1, 3),
+            typs=["labels", "mixed", "empty", "ts", "floats"],
+            fails=TypeError,
+        )
+
+        self.check_result(
+            "loc",
+            slice("20130102", "20130104"),
+            "loc",
+            slice("20130102", "20130104"),
+            typs=["ts"],
+            axes=1,
+            fails=TypeError,
+        )
+
         self.check_result(
             "loc",
             slice(2, 8),