removed index check from the raise condition, axis==1 will suffice

Author: Khemkaran

pandas/core/generic.py

@@ -4569,8 +4569,8 @@ def drop(
             axis_name = self._get_axis_name(axis)
             axes = {axis_name: labels}
         elif index is not None or columns is not None:
-            if axis == 1 and index is not None:
-                raise ValueError("Cannot specify both 'axis' and 'index'")
+            if axis == 1:
+                raise ValueError("Cannot specify both 'axis' and 'index'/'columns'")
             axes = {"index": index}
             if self.ndim == 2:
                 axes["columns"] = columns

pandas/tests/frame/methods/test_drop.py

@@ -346,12 +346,11 @@ def test_drop_multiindex_other_level_nan(self):
         )
         tm.assert_frame_equal(result, expected)
 
-    def test_drop_multiindex_with_axis_and_index(self):
+    def test_drop_with_both_axis_and_index(self):
         df = DataFrame({"a": [1, 2, 3], "b": ["foo", "foo", "bar"]})
-        df = pd.concat([df], keys=["foo"], axis=1)
-        msg = "Cannot specify both 'axis' and 'index'"
+        msg = "Cannot specify both 'axis' and 'index'/'columns'"
         with pytest.raises(ValueError, match=msg):
-            df.drop(index="b", level=1, axis=1)
+            df.drop(index="b", axis=1)
 
     def test_drop_nonunique(self):
         df = DataFrame(