Revert "Back to is_ordered_list_like"

This reverts commit 3796080.
pandas-dev · jreback · Oct 18, 2018 · Oct 9, 2018 · Oct 9, 2018 · Oct 9, 2018
commit 4b91d2e5558d725eaa65f74c2bead41e432be61f
diff --git a/pandas/core/dtypes/common.py b/pandas/core/dtypes/common.py
@@ -18,9 +18,9 @@
     ABCSparseArray, ABCSparseSeries, ABCCategoricalIndex, ABCIndexClass,
     ABCDateOffset)
 from pandas.core.dtypes.inference import (  # noqa:F401
-    is_bool, is_integer, is_float, is_number, is_decimal, is_complex, is_re,
-    is_re_compilable, is_dict_like, is_string_like, is_file_like, is_list_like,
-    is_ordered_list_like, is_nested_list_like, is_sequence, is_named_tuple,
+    is_bool, is_integer, is_float, is_number, is_decimal, is_complex,
+    is_re, is_re_compilable, is_dict_like, is_string_like, is_file_like,
+    is_list_like, is_nested_list_like, is_sequence, is_named_tuple,
     is_hashable, is_iterator, is_array_like, is_scalar, is_interval)
 
 

diff --git a/pandas/core/dtypes/inference.py b/pandas/core/dtypes/inference.py
@@ -247,7 +247,7 @@ def is_re_compilable(obj):
         return True
 
 
-def is_list_like(obj):
+def is_list_like(obj, strict=False):
     """
     Check if the object is list-like.
 
@@ -259,6 +259,8 @@ def is_list_like(obj):
     Parameters
     ----------
     obj : The object to check.
+    strict : boolean, default False
+        If this parameter is True, sets will not be considered list-like
 
     Returns
     -------
@@ -287,28 +289,9 @@ def is_list_like(obj):
             # we do not count strings/unicode/bytes as list-like
             and not isinstance(obj, string_and_binary_types)
             # exclude zero-dimensional numpy arrays, effectively scalars
-            and not (isinstance(obj, np.ndarray) and obj.ndim == 0))
-
-
-def is_ordered_list_like(obj):
-    """
-    Check if the object is list-like and has a defined order
-
-    Works like :meth:`is_list_like` but excludes sets. Note that iterators can
-    not be inspected for order - this check will return True but it is up to
-    the user to make sure that their iterators are generated in an ordered way.
-
-    Parameters
-    ----------
-    obj : The object to check.
-
-    Returns
-    -------
-    is_ordered_list_like : bool
-        Whether `obj` is an ordered list-like
-    """
-    list_like = is_list_like(obj)
-    return list_like and not isinstance(obj, Set)
+            and not (isinstance(obj, np.ndarray) and obj.ndim == 0)
+            # exclude sets if ordered_only
+            and not (strict and isinstance(obj, Set)))
 
 
 def is_array_like(obj):

diff --git a/pandas/core/strings.py b/pandas/core/strings.py
@@ -2030,7 +2030,6 @@ def _get_series_list(self, others, ignore_index=False):
                     # -> elements of nxt must not be list-like
                     is_legal = ((no_deep and nxt.dtype == object)
                                 or all(not is_list_like(x) for x in nxt))
-
                     # DataFrame is false positive of is_legal
                     # because "x in df" returns column names
                     if not is_legal or isinstance(nxt, DataFrame):

diff --git a/pandas/tests/dtypes/test_inference.py b/pandas/tests/dtypes/test_inference.py
@@ -88,15 +88,15 @@ def test_is_list_like_fails(ll):
         DataFrame(), DataFrame([[1]]), iter([1, 2]), (x for x in [1, 2]),
         np.ndarray((2,) * 2), np.ndarray((2,) * 3), np.ndarray((2,) * 4)
     ])
-def test_is_ordered_list_like_strict_passes(ll):
-    assert inference.is_ordered_list_like(ll)
+def test_is_list_like_strict_passes(ll):
+    assert inference.is_list_like(ll, strict=True)
 
 
 @pytest.mark.parametrize("ll", [1, '2', object(), str, np.array(2),
                                 {1, 'a'}, frozenset({1, 'a'})])
-def test_is_ordered_list_like_fails(ll):
+def test_is_list_like_strict_fails(ll):
     # GH 23061
-    assert not inference.is_ordered_list_like(ll)
+    assert not inference.is_list_like(ll, strict=True)
 
 
 def test_is_array_like():