Fix issues from merge · pandas-dev/pandas@4111382 (original) (raw)
2 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -8,7 +8,8 @@ | ||
| 8 | 8 | |
| 9 | 9 | from pandas.core.dtypes.missing import isnull |
| 10 | 10 | from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries, ABCIndexClass |
| 11 | -from pandas.core.dtypes.common import is_object_dtype, is_list_like, is_scalar | |
| 11 | +from pandas.core.dtypes.common import (is_object_dtype, is_list_like, | |
| 12 | +is_scalar, is_extension_type) | |
| 12 | 13 | from pandas.util._validators import validate_bool_kwarg |
| 13 | 14 | |
| 14 | 15 | from pandas.core import common as com, algorithms |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -46,7 +46,6 @@ | ||
| 46 | 46 | _maybe_match_name, |
| 47 | 47 | SettingWithCopyError, |
| 48 | 48 | _maybe_box_datetimelike, |
| 49 | -_dict_compat, | |
| 50 | 49 | standardize_mapping) |
| 51 | 50 | from pandas.core.index import (Index, MultiIndex, InvalidIndexError, |
| 52 | 51 | Float64Index, _ensure_index) |