Fix issues from merge

Author: nateyoder

pandas/core/base.py

@@ -8,7 +8,8 @@
 
 from pandas.core.dtypes.missing import isnull
 from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries, ABCIndexClass
-from pandas.core.dtypes.common import is_object_dtype, is_list_like, is_scalar
+from pandas.core.dtypes.common import (is_object_dtype, is_list_like,
+                                       is_scalar, is_extension_type)
 from pandas.util._validators import validate_bool_kwarg
 
 from pandas.core import common as com, algorithms

pandas/core/series.py

@@ -46,7 +46,6 @@
                                 _maybe_match_name,
                                 SettingWithCopyError,
                                 _maybe_box_datetimelike,
-                                _dict_compat,
                                 standardize_mapping)
 from pandas.core.index import (Index, MultiIndex, InvalidIndexError,
                                Float64Index, _ensure_index)