From ce178db9b9278a452bad6782fc8bd80a380b9df5 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Jan 2020 09:30:24 -0600 Subject: [PATCH 1/2] REF: restructure api import --- pandas/__init__.py | 1 + pandas/io/json/_table_schema.py | 2 +- pandas/io/spss.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pandas/__init__.py b/pandas/__init__.py index f9de17a2e3914..cf2b9b6195da4 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -138,6 +138,7 @@ qcut, ) +from pandas.api import extensions, indexers, types from pandas.util._print_versions import show_versions from pandas.io.api import ( diff --git a/pandas/io/json/_table_schema.py b/pandas/io/json/_table_schema.py index 87bfd6030ec31..5f23b95c10f8e 100644 --- a/pandas/io/json/_table_schema.py +++ b/pandas/io/json/_table_schema.py @@ -18,9 +18,9 @@ is_string_dtype, is_timedelta64_dtype, ) +from pandas.core.dtypes.dtypes import CategoricalDtype from pandas import DataFrame -from pandas.api.types import CategoricalDtype import pandas.core.common as com loads = json.loads diff --git a/pandas/io/spss.py b/pandas/io/spss.py index cf682ec72f284..cdbe14e9fe927 100644 --- a/pandas/io/spss.py +++ b/pandas/io/spss.py @@ -3,7 +3,8 @@ from pandas.compat._optional import import_optional_dependency -from pandas.api.types import is_list_like +from pandas.core.dtypes.inference import is_list_like + from pandas.core.api import DataFrame From eebe4aa3556e7793a2cc808fd16633c5c266b961 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Jan 2020 10:36:16 -0600 Subject: [PATCH 2/2] whoops --- pandas/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/__init__.py b/pandas/__init__.py index cf2b9b6195da4..0c6c1c0433fb9 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -138,7 +138,7 @@ qcut, ) -from pandas.api import extensions, indexers, types +import pandas.api from pandas.util._print_versions import show_versions from pandas.io.api import (