Update code after @jreback's comments

Author: huashuai

doc/source/whatsnew/v0.21.0.txt

@@ -588,9 +588,10 @@ Indexing
 - Bug in ``CategoricalIndex`` reindexing in which specified indices containing duplicates were not being respected (:issue:`17323`)
 - Bug in intersection of ``RangeIndex`` with negative step (:issue:`17296`)
 - Bug in ``IntervalIndex`` where performing a scalar lookup fails for included right endpoints of non-overlapping monotonic decreasing indexes (:issue:`16417`, :issue:`17271`)
+<<<<<<< 4996e764fb0adbd5c77574eb3cb60f19c0fafba3
 <<<<<<< 99300ddcc636c859a02b3010ee379d1adbd1678e
 - Bug in :meth:`DataFrame.first_valid_index` and :meth:`DataFrame.last_valid_index` when no valid entry (:issue:`17400`)
-- Bug in ``Series.rename`` when called with `str` alters name of series rather than index of series. (:issue:`17407`)
+- Bug in ``Series.rename`` when called with a `callable` alters name of series rather than index of series. (:issue:`17407`)
 
 I/O
 ^^^

pandas/core/dtypes/inference.py

@@ -3,6 +3,7 @@
 import collections
 import re
 import numpy as np
+from collections import Iterable
 from numbers import Number
 from pandas.compat import (PY2, string_types, text_type,
                            string_and_binary_types)
@@ -262,10 +263,8 @@ def is_list_like(obj):
     False
     """
 
-    return (hasattr(obj, '__iter__') and
-            not isinstance(obj, string_and_binary_types) and
-            isinstance(obj, collections.Iterable))
-
+    return ((hasattr(obj, '__iter__') or isinstance(obj, Iterable)) and
+            not isinstance(obj, string_and_binary_types))
 
 def is_nested_list_like(obj):
     """