From 1ee7d428848233f2f7bcde03a66e2e098be34c1a Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Thu, 25 Oct 2018 16:52:59 -0400 Subject: [PATCH 1/7] Partialy fix issue #23334 - isort pandas/core/dtypes directory --- pandas/core/dtypes/api.py | 71 ++++++--------------------------- pandas/core/dtypes/base.py | 2 +- pandas/core/dtypes/cast.py | 51 ++++++++++------------- pandas/core/dtypes/common.py | 30 +++++++------- pandas/core/dtypes/concat.py | 26 +++++------- pandas/core/dtypes/dtypes.py | 6 ++- pandas/core/dtypes/inference.py | 9 +++-- pandas/core/dtypes/missing.py | 32 ++++++--------- setup.cfg | 8 ---- 9 files changed, 83 insertions(+), 152 deletions(-) diff --git a/pandas/core/dtypes/api.py b/pandas/core/dtypes/api.py index 738e1ea9062f6..0318de7a92a29 100644 --- a/pandas/core/dtypes/api.py +++ b/pandas/core/dtypes/api.py @@ -2,64 +2,19 @@ import sys -from .common import (pandas_dtype, - is_dtype_equal, - is_extension_type, - - # categorical - is_categorical, - is_categorical_dtype, - - # interval - is_interval, - is_interval_dtype, - - # datetimelike - is_datetimetz, - is_datetime64_dtype, - is_datetime64tz_dtype, - is_datetime64_any_dtype, - is_datetime64_ns_dtype, - is_timedelta64_dtype, - is_timedelta64_ns_dtype, - is_period, - is_period_dtype, - - # string-like - is_string_dtype, - is_object_dtype, - - # sparse - is_sparse, - - # numeric types - is_scalar, - is_sparse, - is_bool, - is_integer, - is_float, - is_complex, - is_number, - is_integer_dtype, - is_int64_dtype, - is_numeric_dtype, - is_float_dtype, - is_bool_dtype, - is_complex_dtype, - is_signed_integer_dtype, - is_unsigned_integer_dtype, - - # like - is_re, - is_re_compilable, - is_dict_like, - is_iterator, - is_file_like, - is_array_like, - is_list_like, - is_hashable, - is_named_tuple) - +from .common import ( # categorical; interval; datetimelike; string-like; sparse; numeric types; like + is_array_like, is_bool, is_bool_dtype, is_categorical, + is_categorical_dtype, is_complex, is_complex_dtype, + is_datetime64_any_dtype, is_datetime64_dtype, is_datetime64_ns_dtype, + is_datetime64tz_dtype, is_datetimetz, is_dict_like, is_dtype_equal, + is_extension_type, is_file_like, is_float, is_float_dtype, is_hashable, + is_int64_dtype, is_integer, is_integer_dtype, is_interval, + is_interval_dtype, is_iterator, is_list_like, is_named_tuple, is_number, + is_numeric_dtype, is_object_dtype, is_period, is_period_dtype, is_re, + is_re_compilable, is_scalar, is_signed_integer_dtype, is_sparse, + is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype, + is_unsigned_integer_dtype, pandas_dtype +) # deprecated m = sys.modules['pandas.core.dtypes.api'] diff --git a/pandas/core/dtypes/base.py b/pandas/core/dtypes/base.py index ac4d6d1590f38..f152c91bf2fef 100644 --- a/pandas/core/dtypes/base.py +++ b/pandas/core/dtypes/base.py @@ -2,7 +2,7 @@ import numpy as np from pandas import compat -from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCDataFrame +from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries from pandas.errors import AbstractMethodError diff --git a/pandas/core/dtypes/cast.py b/pandas/core/dtypes/cast.py index 56bf394729773..302cd1c68c4dc 100644 --- a/pandas/core/dtypes/cast.py +++ b/pandas/core/dtypes/cast.py @@ -1,40 +1,31 @@ """ routings for casting """ +import warnings from datetime import datetime, timedelta import numpy as np -import warnings -from pandas._libs import tslib, lib, tslibs -from pandas._libs.tslibs import iNaT, OutOfBoundsDatetime -from pandas.compat import string_types, text_type, PY3 -from .common import (ensure_object, is_bool, is_integer, is_float, - is_complex, is_datetimetz, is_categorical_dtype, - is_datetimelike, - is_extension_type, - is_extension_array_dtype, - is_object_dtype, - is_datetime64tz_dtype, is_datetime64_dtype, - is_datetime64_ns_dtype, - is_timedelta64_dtype, is_timedelta64_ns_dtype, - is_dtype_equal, - is_float_dtype, is_complex_dtype, - is_integer_dtype, - is_unsigned_integer_dtype, - is_datetime_or_timedelta_dtype, - is_bool_dtype, is_scalar, - is_string_dtype, _string_dtypes, - pandas_dtype, - ensure_int8, ensure_int16, - ensure_int32, ensure_int64, - _NS_DTYPE, _TD_DTYPE, _INT64_DTYPE, - _POSSIBLY_CAST_DTYPES) -from .dtypes import (ExtensionDtype, PandasExtensionDtype, DatetimeTZDtype, - PeriodDtype) -from .generic import (ABCDatetimeIndex, ABCPeriodIndex, - ABCSeries) -from .missing import isna, notna +from pandas._libs import lib, tslib, tslibs +from pandas._libs.tslibs import OutOfBoundsDatetime, iNaT +from pandas.compat import PY3, string_types, text_type + +from .common import ( + _INT64_DTYPE, _NS_DTYPE, _POSSIBLY_CAST_DTYPES, _TD_DTYPE, _string_dtypes, + ensure_int8, ensure_int16, ensure_int32, ensure_int64, ensure_object, + is_bool, is_bool_dtype, is_categorical_dtype, is_complex, is_complex_dtype, + is_datetime64_dtype, is_datetime64_ns_dtype, is_datetime64tz_dtype, + is_datetime_or_timedelta_dtype, is_datetimelike, is_datetimetz, + is_dtype_equal, is_extension_array_dtype, is_extension_type, is_float, + is_float_dtype, is_integer, is_integer_dtype, is_object_dtype, is_scalar, + is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype, + is_unsigned_integer_dtype, pandas_dtype +) +from .dtypes import ( + DatetimeTZDtype, ExtensionDtype, PandasExtensionDtype, PeriodDtype +) +from .generic import ABCDatetimeIndex, ABCPeriodIndex, ABCSeries from .inference import is_list_like +from .missing import isna, notna _int8_max = np.iinfo(np.int8).max _int16_max = np.iinfo(np.int16).max diff --git a/pandas/core/dtypes/common.py b/pandas/core/dtypes/common.py index af5e1523c7cec..e31bdde7153d1 100644 --- a/pandas/core/dtypes/common.py +++ b/pandas/core/dtypes/common.py @@ -1,25 +1,25 @@ """ common type operations """ import numpy as np -from pandas.compat import (string_types, text_type, binary_type, - PY3, PY36) + from pandas._libs import algos, lib -from pandas._libs.tslibs import conversion, Period, Timestamp from pandas._libs.interval import Interval - +from pandas._libs.tslibs import Period, Timestamp, conversion +from pandas.compat import PY3, PY36, binary_type, string_types, text_type from pandas.core.dtypes.dtypes import ( - registry, CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype, - PeriodDtype, IntervalDtype, - PandasExtensionDtype, ExtensionDtype, - _pandas_registry) + CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype, ExtensionDtype, + IntervalDtype, PandasExtensionDtype, PeriodDtype, _pandas_registry, + registry +) from pandas.core.dtypes.generic import ( - ABCCategorical, ABCPeriodIndex, ABCDatetimeIndex, ABCSeries, - ABCSparseArray, ABCSparseSeries, ABCCategoricalIndex, ABCIndexClass, - ABCDateOffset) + ABCCategorical, ABCCategoricalIndex, ABCDateOffset, ABCDatetimeIndex, + ABCIndexClass, ABCPeriodIndex, ABCSeries, ABCSparseArray, ABCSparseSeries +) 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_nested_list_like, is_sequence, is_named_tuple, - is_hashable, is_iterator, is_array_like, is_scalar, is_interval) + is_array_like, is_bool, is_complex, is_decimal, is_dict_like, is_file_like, + is_float, is_hashable, is_integer, is_interval, is_iterator, is_list_like, + is_named_tuple, is_nested_list_like, is_number, is_re, is_re_compilable, + is_scalar, is_sequence, is_string_like +) _POSSIBLY_CAST_DTYPES = {np.dtype(t).name for t in ['O', 'int8', 'uint8', 'int16', 'uint16', diff --git a/pandas/core/dtypes/concat.py b/pandas/core/dtypes/concat.py index df67afd406d06..bcb2aa8d95708 100644 --- a/pandas/core/dtypes/concat.py +++ b/pandas/core/dtypes/concat.py @@ -3,25 +3,19 @@ """ import numpy as np -from pandas._libs import tslib, tslibs + from pandas import compat +from pandas._libs import tslib, tslibs from pandas.core.dtypes.common import ( - is_categorical_dtype, - is_sparse, - is_extension_array_dtype, - is_datetimetz, - is_datetime64_dtype, - is_timedelta64_dtype, - is_period_dtype, - is_object_dtype, - is_bool_dtype, - is_interval_dtype, - is_dtype_equal, - _NS_DTYPE, - _TD_DTYPE) + _NS_DTYPE, _TD_DTYPE, is_bool_dtype, is_categorical_dtype, + is_datetime64_dtype, is_datetimetz, is_dtype_equal, + is_extension_array_dtype, is_interval_dtype, is_object_dtype, + is_period_dtype, is_sparse, is_timedelta64_dtype +) from pandas.core.dtypes.generic import ( - ABCDatetimeIndex, ABCTimedeltaIndex, - ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame) + ABCDatetimeIndex, ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame, + ABCTimedeltaIndex +) def get_dtype_kinds(l): diff --git a/pandas/core/dtypes/dtypes.py b/pandas/core/dtypes/dtypes.py index f07fb3cd80eab..9d4448360d0aa 100644 --- a/pandas/core/dtypes/dtypes.py +++ b/pandas/core/dtypes/dtypes.py @@ -1,11 +1,13 @@ """ define extension dtypes """ import re + import numpy as np + from pandas import compat -from pandas.core.dtypes.generic import ABCIndexClass, ABCCategoricalIndex -from pandas._libs.tslibs import Period, NaT, Timestamp from pandas._libs.interval import Interval +from pandas._libs.tslibs import NaT, Period, Timestamp +from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCIndexClass from .base import ExtensionDtype, _DtypeOpsMixin diff --git a/pandas/core/dtypes/inference.py b/pandas/core/dtypes/inference.py index 7470497383064..44f6ac463b329 100644 --- a/pandas/core/dtypes/inference.py +++ b/pandas/core/dtypes/inference.py @@ -1,12 +1,15 @@ """ basic inference routines """ import re -import numpy as np from numbers import Number + +import numpy as np + from pandas import compat -from pandas.compat import (PY2, string_types, text_type, - string_and_binary_types, re_type, Set) from pandas._libs import lib +from pandas.compat import ( + PY2, Set, re_type, string_and_binary_types, string_types, text_type +) is_bool = lib.is_bool diff --git a/pandas/core/dtypes/missing.py b/pandas/core/dtypes/missing.py index e48d09ae9a96a..8ca48e0c4e3ee 100644 --- a/pandas/core/dtypes/missing.py +++ b/pandas/core/dtypes/missing.py @@ -2,27 +2,21 @@ missing types & inference """ import numpy as np + from pandas._libs import lib, missing as libmissing from pandas._libs.tslibs import NaT, iNaT -from .generic import (ABCMultiIndex, ABCSeries, - ABCIndexClass, ABCGeneric, - ABCExtensionArray) -from .common import (is_string_dtype, is_datetimelike, - is_datetimelike_v_numeric, is_float_dtype, - is_datetime64_dtype, is_datetime64tz_dtype, - is_timedelta64_dtype, - is_period_dtype, - is_complex_dtype, - is_string_like_dtype, is_bool_dtype, - is_integer_dtype, is_dtype_equal, - is_extension_array_dtype, - needs_i8_conversion, ensure_object, - pandas_dtype, - is_scalar, - is_object_dtype, - is_integer, - _TD_DTYPE, - _NS_DTYPE) + +from .common import ( + _NS_DTYPE, _TD_DTYPE, ensure_object, is_bool_dtype, is_complex_dtype, + is_datetime64_dtype, is_datetime64tz_dtype, is_datetimelike, + is_datetimelike_v_numeric, is_dtype_equal, is_extension_array_dtype, + is_float_dtype, is_integer, is_integer_dtype, is_object_dtype, + is_period_dtype, is_scalar, is_string_dtype, is_string_like_dtype, + is_timedelta64_dtype, needs_i8_conversion, pandas_dtype +) +from .generic import ( + ABCExtensionArray, ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries +) from .inference import is_list_like isposinf_scalar = libmissing.isposinf_scalar diff --git a/setup.cfg b/setup.cfg index ee39844996025..ff3f59cb33ca2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -171,14 +171,6 @@ skip= pandas/core/tools/numeric.py, pandas/core/tools/timedeltas.py, pandas/core/tools/datetimes.py, - pandas/core/dtypes/concat.py, - pandas/core/dtypes/cast.py, - pandas/core/dtypes/api.py, - pandas/core/dtypes/dtypes.py, - pandas/core/dtypes/base.py, - pandas/core/dtypes/common.py, - pandas/core/dtypes/missing.py, - pandas/core/dtypes/inference.py, pandas/core/internals/concat.py, pandas/core/internals/managers.py, pandas/core/internals/blocks.py, From f1160c1236c00d64363e3913756d04462f63c891 Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Thu, 25 Oct 2018 17:04:40 -0400 Subject: [PATCH 2/7] Fix Line 5:80: E501 line too long (102 > 79 characters) issue --- pandas/core/dtypes/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/core/dtypes/api.py b/pandas/core/dtypes/api.py index 0318de7a92a29..7cd3c88043f7c 100644 --- a/pandas/core/dtypes/api.py +++ b/pandas/core/dtypes/api.py @@ -2,7 +2,8 @@ import sys -from .common import ( # categorical; interval; datetimelike; string-like; sparse; numeric types; like +# categorical; interval; datetimelike; string-like; sparse; numeric types; like +from .common import ( is_array_like, is_bool, is_bool_dtype, is_categorical, is_categorical_dtype, is_complex, is_complex_dtype, is_datetime64_any_dtype, is_datetime64_dtype, is_datetime64_ns_dtype, From 7615a7a08ec1719f139ff27f00524829b30eaf8b Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Fri, 26 Oct 2018 13:22:22 -0400 Subject: [PATCH 3/7] Added ABCPeriodArray back to common.py --- pandas/core/dtypes/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/core/dtypes/common.py b/pandas/core/dtypes/common.py index e31bdde7153d1..de2709760b443 100644 --- a/pandas/core/dtypes/common.py +++ b/pandas/core/dtypes/common.py @@ -12,7 +12,8 @@ ) from pandas.core.dtypes.generic import ( ABCCategorical, ABCCategoricalIndex, ABCDateOffset, ABCDatetimeIndex, - ABCIndexClass, ABCPeriodIndex, ABCSeries, ABCSparseArray, ABCSparseSeries + ABCIndexClass, ABCPeriodArray, ABCPeriodIndex, ABCSeries, ABCSparseArray, + ABCSparseSeries ) from pandas.core.dtypes.inference import ( # noqa:F401 is_array_like, is_bool, is_complex, is_decimal, is_dict_like, is_file_like, From 30b6f95300f2044673f59134b5c78ab649739a62 Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Fri, 26 Oct 2018 16:54:17 -0400 Subject: [PATCH 4/7] Rerun isort --- pandas/core/dtypes/cast.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/core/dtypes/cast.py b/pandas/core/dtypes/cast.py index a89d6f6708c44..a6f724642f893 100644 --- a/pandas/core/dtypes/cast.py +++ b/pandas/core/dtypes/cast.py @@ -24,7 +24,6 @@ DatetimeTZDtype, ExtensionDtype, PandasExtensionDtype, PeriodDtype ) from .generic import ABCDatetimeIndex, ABCPeriodIndex, ABCSeries -from .missing import isna, notna from .inference import is_list_like from .missing import isna, notna From ff2eaa5f7521a620b0590b0f1abefac0b36ec964 Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Mon, 29 Oct 2018 11:19:40 -0400 Subject: [PATCH 5/7] Rerun isort, resolve conflict, rebase --- pandas/core/dtypes/api.py | 70 ++++++--------------------------- pandas/core/dtypes/base.py | 6 ++- pandas/core/dtypes/cast.py | 9 ++--- pandas/core/dtypes/common.py | 10 ++--- pandas/core/dtypes/concat.py | 14 +++---- pandas/core/dtypes/dtypes.py | 4 +- pandas/core/dtypes/inference.py | 8 ++-- pandas/core/dtypes/missing.py | 10 ++--- 8 files changed, 42 insertions(+), 89 deletions(-) diff --git a/pandas/core/dtypes/api.py b/pandas/core/dtypes/api.py index 7bf3912b05b1d..f7254e1c1d691 100644 --- a/pandas/core/dtypes/api.py +++ b/pandas/core/dtypes/api.py @@ -1,59 +1,15 @@ # flake8: noqa -from .common import (pandas_dtype, - is_dtype_equal, - is_extension_type, - - # categorical - is_categorical, - is_categorical_dtype, - - # interval - is_interval, - is_interval_dtype, - - # datetimelike - is_datetimetz, - is_datetime64_dtype, - is_datetime64tz_dtype, - is_datetime64_any_dtype, - is_datetime64_ns_dtype, - is_timedelta64_dtype, - is_timedelta64_ns_dtype, - is_period, - is_period_dtype, - - # string-like - is_string_dtype, - is_object_dtype, - - # sparse - is_sparse, - - # numeric types - is_scalar, - is_sparse, - is_bool, - is_integer, - is_float, - is_complex, - is_number, - is_integer_dtype, - is_int64_dtype, - is_numeric_dtype, - is_float_dtype, - is_bool_dtype, - is_complex_dtype, - is_signed_integer_dtype, - is_unsigned_integer_dtype, - - # like - is_re, - is_re_compilable, - is_dict_like, - is_iterator, - is_file_like, - is_array_like, - is_list_like, - is_hashable, - is_named_tuple) +# categorical; interval; datetimelike; string-like; sparse; numeric types; like +from .common import ( + is_array_like, is_bool, is_bool_dtype, is_categorical, + is_categorical_dtype, is_complex, is_complex_dtype, + is_datetime64_any_dtype, is_datetime64_dtype, is_datetime64_ns_dtype, + is_datetime64tz_dtype, is_datetimetz, is_dict_like, is_dtype_equal, + is_extension_type, is_file_like, is_float, is_float_dtype, is_hashable, + is_int64_dtype, is_integer, is_integer_dtype, is_interval, + is_interval_dtype, is_iterator, is_list_like, is_named_tuple, is_number, + is_numeric_dtype, is_object_dtype, is_period, is_period_dtype, is_re, + is_re_compilable, is_scalar, is_signed_integer_dtype, is_sparse, + is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype, + is_unsigned_integer_dtype, pandas_dtype) diff --git a/pandas/core/dtypes/base.py b/pandas/core/dtypes/base.py index f152c91bf2fef..df0e89cced816 100644 --- a/pandas/core/dtypes/base.py +++ b/pandas/core/dtypes/base.py @@ -1,10 +1,12 @@ """Extend pandas with custom array types""" import numpy as np -from pandas import compat -from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries from pandas.errors import AbstractMethodError +from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries + +from pandas import compat + class _DtypeOpsMixin(object): # Not all of pandas' extension dtypes are compatibile with diff --git a/pandas/core/dtypes/cast.py b/pandas/core/dtypes/cast.py index 038b13612c76e..c7c6f89eb13a4 100644 --- a/pandas/core/dtypes/cast.py +++ b/pandas/core/dtypes/cast.py @@ -1,12 +1,11 @@ """ routings for casting """ -import warnings from datetime import datetime, timedelta import numpy as np from pandas._libs import lib, tslib, tslibs -from pandas._libs.tslibs import OutOfBoundsDatetime, iNaT +from pandas._libs.tslibs import OutOfBoundsDatetime, Period, iNaT from pandas.compat import PY3, string_types, text_type from .common import ( @@ -18,11 +17,9 @@ is_dtype_equal, is_extension_array_dtype, is_extension_type, is_float, is_float_dtype, is_integer, is_integer_dtype, is_object_dtype, is_scalar, is_string_dtype, is_timedelta64_dtype, is_timedelta64_ns_dtype, - is_unsigned_integer_dtype, pandas_dtype -) + is_unsigned_integer_dtype, pandas_dtype) from .dtypes import ( - DatetimeTZDtype, ExtensionDtype, PandasExtensionDtype, PeriodDtype -) + DatetimeTZDtype, ExtensionDtype, PandasExtensionDtype, PeriodDtype) from .generic import ABCDatetimeIndex, ABCPeriodIndex, ABCSeries from .inference import is_list_like from .missing import isna, notna diff --git a/pandas/core/dtypes/common.py b/pandas/core/dtypes/common.py index 7ddb05706cfc6..94e9b72b001b1 100644 --- a/pandas/core/dtypes/common.py +++ b/pandas/core/dtypes/common.py @@ -5,22 +5,20 @@ from pandas._libs.interval import Interval from pandas._libs.tslibs import Period, Timestamp, conversion from pandas.compat import PY3, PY36, binary_type, string_types, text_type + from pandas.core.dtypes.dtypes import ( CategoricalDtype, CategoricalDtypeType, DatetimeTZDtype, ExtensionDtype, IntervalDtype, PandasExtensionDtype, PeriodDtype, _pandas_registry, - registry -) + registry) from pandas.core.dtypes.generic import ( ABCCategorical, ABCCategoricalIndex, ABCDateOffset, ABCDatetimeIndex, ABCIndexClass, ABCPeriodArray, ABCPeriodIndex, ABCSeries, ABCSparseArray, - ABCSparseSeries -) + ABCSparseSeries) from pandas.core.dtypes.inference import ( # noqa:F401 is_array_like, is_bool, is_complex, is_decimal, is_dict_like, is_file_like, is_float, is_hashable, is_integer, is_interval, is_iterator, is_list_like, is_named_tuple, is_nested_list_like, is_number, is_re, is_re_compilable, - is_scalar, is_sequence, is_string_like -) + is_scalar, is_sequence, is_string_like) _POSSIBLY_CAST_DTYPES = {np.dtype(t).name for t in ['O', 'int8', 'uint8', 'int16', 'uint16', diff --git a/pandas/core/dtypes/concat.py b/pandas/core/dtypes/concat.py index 3f76a220b7ea1..82d136ef7cdbf 100644 --- a/pandas/core/dtypes/concat.py +++ b/pandas/core/dtypes/concat.py @@ -1,21 +1,21 @@ """ -Utility functions related to concat -""" + Utility functions related to concat + """ import numpy as np -from pandas import compat from pandas._libs import tslib, tslibs + from pandas.core.dtypes.common import ( _NS_DTYPE, _TD_DTYPE, is_bool_dtype, is_categorical_dtype, is_datetime64_dtype, is_datetimetz, is_dtype_equal, is_extension_array_dtype, is_interval_dtype, is_object_dtype, - is_period_dtype, is_sparse, is_timedelta64_dtype -) + is_period_dtype, is_sparse, is_timedelta64_dtype) from pandas.core.dtypes.generic import ( ABCDatetimeIndex, ABCPeriodIndex, ABCRangeIndex, ABCSparseDataFrame, - ABCTimedeltaIndex -) + ABCTimedeltaIndex) + +from pandas import compat def get_dtype_kinds(l): diff --git a/pandas/core/dtypes/dtypes.py b/pandas/core/dtypes/dtypes.py index 4239a24b3d58c..4dfefdec031b2 100644 --- a/pandas/core/dtypes/dtypes.py +++ b/pandas/core/dtypes/dtypes.py @@ -4,11 +4,13 @@ import numpy as np -from pandas import compat from pandas._libs.interval import Interval from pandas._libs.tslibs import NaT, Period, Timestamp + from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCIndexClass +from pandas import compat + from .base import ExtensionDtype, _DtypeOpsMixin diff --git a/pandas/core/dtypes/inference.py b/pandas/core/dtypes/inference.py index 44f6ac463b329..d56bd83f01236 100644 --- a/pandas/core/dtypes/inference.py +++ b/pandas/core/dtypes/inference.py @@ -1,15 +1,15 @@ """ basic inference routines """ -import re from numbers import Number +import re import numpy as np -from pandas import compat from pandas._libs import lib from pandas.compat import ( - PY2, Set, re_type, string_and_binary_types, string_types, text_type -) + PY2, Set, re_type, string_and_binary_types, string_types, text_type) + +from pandas import compat is_bool = lib.is_bool diff --git a/pandas/core/dtypes/missing.py b/pandas/core/dtypes/missing.py index c8205cb3e0707..c80dbedb1c9c9 100644 --- a/pandas/core/dtypes/missing.py +++ b/pandas/core/dtypes/missing.py @@ -1,6 +1,6 @@ """ -missing types & inference -""" + missing types & inference + """ import numpy as np from pandas._libs import lib, missing as libmissing @@ -12,11 +12,9 @@ is_datetimelike_v_numeric, is_dtype_equal, is_extension_array_dtype, is_float_dtype, is_integer, is_integer_dtype, is_object_dtype, is_period_dtype, is_scalar, is_string_dtype, is_string_like_dtype, - is_timedelta64_dtype, needs_i8_conversion, pandas_dtype -) + is_timedelta64_dtype, needs_i8_conversion, pandas_dtype) from .generic import ( - ABCExtensionArray, ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries -) + ABCExtensionArray, ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries) from .inference import is_list_like isposinf_scalar = libmissing.isposinf_scalar From 8172b67b2e42a82f8bc0d0c2339f52ca2307ba95 Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Mon, 29 Oct 2018 19:41:13 -0400 Subject: [PATCH 6/7] Indentation fix --- pandas/core/dtypes/concat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/dtypes/concat.py b/pandas/core/dtypes/concat.py index 82d136ef7cdbf..b2999c112e8ab 100644 --- a/pandas/core/dtypes/concat.py +++ b/pandas/core/dtypes/concat.py @@ -1,6 +1,6 @@ """ - Utility functions related to concat - """ +Utility functions related to concat +""" import numpy as np From a74f2b6ba2964432c1f992fbc71309f82652802c Mon Sep 17 00:00:00 2001 From: Alexander Ponomaroff Date: Tue, 30 Oct 2018 09:52:49 -0400 Subject: [PATCH 7/7] Requested changes --- pandas/core/dtypes/api.py | 1 - pandas/core/dtypes/missing.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pandas/core/dtypes/api.py b/pandas/core/dtypes/api.py index f7254e1c1d691..76021705563bf 100644 --- a/pandas/core/dtypes/api.py +++ b/pandas/core/dtypes/api.py @@ -1,6 +1,5 @@ # flake8: noqa -# categorical; interval; datetimelike; string-like; sparse; numeric types; like from .common import ( is_array_like, is_bool, is_bool_dtype, is_categorical, is_categorical_dtype, is_complex, is_complex_dtype, diff --git a/pandas/core/dtypes/missing.py b/pandas/core/dtypes/missing.py index c80dbedb1c9c9..a12985bb7d42c 100644 --- a/pandas/core/dtypes/missing.py +++ b/pandas/core/dtypes/missing.py @@ -1,6 +1,6 @@ """ - missing types & inference - """ +missing types & inference +""" import numpy as np from pandas._libs import lib, missing as libmissing