add conditions for error messages for label=true and label is_list_like

Author: ryankarlos

pandas/core/reshape/tile.py

@@ -18,6 +18,7 @@
     is_integer,
     is_scalar,
     is_timedelta64_dtype,
+    is_list_like
 )
 from pandas.core.dtypes.generic import ABCSeries
 from pandas.core.dtypes.missing import isna
@@ -397,11 +398,17 @@ def _bins_to_cuts(
             labels = _format_labels(
                 bins, precision, right=right, include_lowest=include_lowest, dtype=dtype
             )
-        else:
+        elif labels:
+            raise ValueError(
+                "User desired bin labels must be passed in as an argument, not just `True`"
+            )
+        elif is_list_like(labels):
             if len(labels) != len(bins) - 1:
                 raise ValueError(
                     "Bin labels must be one fewer than the number of bin edges"
                 )
+            else:
+                labels = Categorical(labels, categories=labels, ordered=True)
         if not is_categorical_dtype(labels):
             labels = Categorical(labels, categories=labels, ordered=True)
 

pandas/tests/reshape/test_qcut.py

@@ -130,14 +130,12 @@ def test_qcut_return_intervals():
     tm.assert_series_equal(res, exp)
 
 
-@pytest.mark.parametrize("values", ['foo', 1, list(range(10))])
 def test_qcut_labels_true():
     # issue 13318
+    values = range(5)
     msg = "User desired bin labels must be passed in as an argument, not just `True`"
-    with pytest.raises(ValueError) as w:
-        qcut(values, 5, labels=True)
-
-    assert w[0].message[0] == msg
+    with pytest.raises(ValueError ,match=msg) as w:
+        qcut(values, 4, labels=True)
 
 
 @pytest.mark.parametrize(