Skip to content

Commit 9cefd65

Browse files
alimcmaster1jreback
authored andcommitted
ISORT: Add _typing to pre_core isort block (#30423)
1 parent e6a3993 commit 9cefd65

30 files changed

+32
-36
lines changed

pandas/core/arrays/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import numpy as np
1212

13+
from pandas._typing import ArrayLike
1314
from pandas.compat import set_function_name
1415
from pandas.compat.numpy import function as nv
1516
from pandas.errors import AbstractMethodError
@@ -21,7 +22,6 @@
2122
from pandas.core.dtypes.generic import ABCExtensionArray, ABCIndexClass, ABCSeries
2223
from pandas.core.dtypes.missing import isna
2324

24-
from pandas._typing import ArrayLike
2525
from pandas.core import ops
2626
from pandas.core.algorithms import _factorize_array, unique
2727
from pandas.core.missing import backfill_1d, pad_1d

pandas/core/arrays/categorical.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from pandas._config import get_option
99

1010
from pandas._libs import algos as libalgos, hashtable as htable
11+
from pandas._typing import ArrayLike, Dtype, Ordered
1112
from pandas.compat.numpy import function as nv
1213
from pandas.util._decorators import (
1314
Appender,
@@ -41,7 +42,6 @@
4142
from pandas.core.dtypes.inference import is_hashable
4243
from pandas.core.dtypes.missing import isna, notna
4344

44-
from pandas._typing import ArrayLike, Dtype, Ordered
4545
from pandas.core import ops
4646
from pandas.core.accessor import PandasDelegate, delegate_names
4747
import pandas.core.algorithms as algorithms

pandas/core/arrays/datetimelike.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from pandas._libs.tslibs.period import DIFFERENT_FREQ, IncompatibleFrequency, Period
1111
from pandas._libs.tslibs.timedeltas import Timedelta, delta_to_nanoseconds
1212
from pandas._libs.tslibs.timestamps import RoundTo, round_nsint64
13+
from pandas._typing import DatetimeLikeScalar
1314
from pandas.compat.numpy import function as nv
1415
from pandas.errors import AbstractMethodError, NullFrequencyError, PerformanceWarning
1516
from pandas.util._decorators import Appender, Substitution
@@ -37,7 +38,6 @@
3738
from pandas.core.dtypes.inference import is_array_like
3839
from pandas.core.dtypes.missing import is_valid_nat_for_dtype, isna
3940

40-
from pandas._typing import DatetimeLikeScalar
4141
from pandas.core import missing, nanops
4242
from pandas.core.algorithms import checked_add_with_arr, take, unique1d, value_counts
4343
import pandas.core.common as com

pandas/core/arrays/sparse/dtype.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import numpy as np
77

8+
from pandas._typing import Dtype
9+
810
from pandas.core.dtypes.base import ExtensionDtype
911
from pandas.core.dtypes.cast import astype_nansafe
1012
from pandas.core.dtypes.common import (
@@ -17,8 +19,6 @@
1719
from pandas.core.dtypes.dtypes import register_extension_dtype
1820
from pandas.core.dtypes.missing import isna, na_value_for_dtype
1921

20-
from pandas._typing import Dtype
21-
2222

2323
@register_extension_dtype
2424
class SparseDtype(ExtensionDtype):

pandas/core/construction.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from pandas._libs import lib
1313
from pandas._libs.tslibs import IncompatibleFrequency, OutOfBoundsDatetime
14+
from pandas._typing import ArrayLike, Dtype
1415

1516
from pandas.core.dtypes.cast import (
1617
construct_1d_arraylike_from_scalar,
@@ -44,7 +45,6 @@
4445
)
4546
from pandas.core.dtypes.missing import isna
4647

47-
from pandas._typing import ArrayLike, Dtype
4848
import pandas.core.common as com
4949

5050
if TYPE_CHECKING:

pandas/core/dtypes/common.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from pandas._libs import algos, lib
88
from pandas._libs.tslibs import conversion
9+
from pandas._typing import ArrayLike
910

1011
from pandas.core.dtypes.dtypes import (
1112
CategoricalDtype,
@@ -46,8 +47,6 @@
4647
is_sequence,
4748
)
4849

49-
from pandas._typing import ArrayLike
50-
5150
_POSSIBLY_CAST_DTYPES = {
5251
np.dtype(t).name
5352
for t in [

pandas/core/dtypes/dtypes.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
from pandas._libs.interval import Interval
99
from pandas._libs.tslibs import NaT, Period, Timestamp, timezones
10+
from pandas._typing import Ordered
1011

1112
from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCDateOffset, ABCIndexClass
1213

13-
from pandas._typing import Ordered
14-
1514
from .base import ExtensionDtype
1615
from .inference import is_bool, is_list_like
1716

pandas/core/frame.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
from pandas._config import get_option
3737

3838
from pandas._libs import algos as libalgos, lib
39+
from pandas._typing import Axes, Dtype, FilePathOrBuffer
3940
from pandas.compat.numpy import function as nv
4041
from pandas.util._decorators import (
4142
Appender,
@@ -91,7 +92,6 @@
9192
)
9293
from pandas.core.dtypes.missing import isna, notna
9394

94-
from pandas._typing import Axes, Dtype, FilePathOrBuffer
9595
from pandas.core import algorithms, common as com, nanops, ops
9696
from pandas.core.accessor import CachedAccessor
9797
from pandas.core.arrays import Categorical, ExtensionArray

pandas/core/generic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from pandas._config import config
3030

3131
from pandas._libs import Timestamp, iNaT, properties
32+
from pandas._typing import Dtype, FilePathOrBuffer, FrameOrSeries, JSONSerializable
3233
from pandas.compat import set_function_name
3334
from pandas.compat._optional import import_optional_dependency
3435
from pandas.compat.numpy import function as nv
@@ -67,7 +68,6 @@
6768
from pandas.core.dtypes.missing import isna, notna
6869

6970
import pandas as pd
70-
from pandas._typing import Dtype, FilePathOrBuffer, FrameOrSeries, JSONSerializable
7171
from pandas.core import missing, nanops
7272
import pandas.core.algorithms as algos
7373
from pandas.core.base import PandasObject, SelectionMixin

pandas/core/groupby/generic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import numpy as np
2626

2727
from pandas._libs import Timestamp, lib
28+
from pandas._typing import FrameOrSeries
2829
from pandas.util._decorators import Appender, Substitution
2930

3031
from pandas.core.dtypes.cast import (
@@ -47,7 +48,6 @@
4748
)
4849
from pandas.core.dtypes.missing import _isna_ndarraylike, isna, notna
4950

50-
from pandas._typing import FrameOrSeries
5151
import pandas.core.algorithms as algorithms
5252
from pandas.core.base import DataError, SpecificationError
5353
import pandas.core.common as com

pandas/core/groupby/groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class providing the base-class of operations.
3333

3434
from pandas._libs import Timestamp
3535
import pandas._libs.groupby as libgroupby
36+
from pandas._typing import FrameOrSeries, Scalar
3637
from pandas.compat import set_function_name
3738
from pandas.compat.numpy import function as nv
3839
from pandas.errors import AbstractMethodError
@@ -50,7 +51,6 @@ class providing the base-class of operations.
5051
)
5152
from pandas.core.dtypes.missing import isna, notna
5253

53-
from pandas._typing import FrameOrSeries, Scalar
5454
from pandas.core import nanops
5555
import pandas.core.algorithms as algorithms
5656
from pandas.core.arrays import Categorical, DatetimeArray, try_cast_to_ea

pandas/core/groupby/grouper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import numpy as np
99

10+
from pandas._typing import FrameOrSeries
1011
from pandas.util._decorators import cache_readonly
1112

1213
from pandas.core.dtypes.common import (
@@ -19,7 +20,6 @@
1920
)
2021
from pandas.core.dtypes.generic import ABCSeries
2122

22-
from pandas._typing import FrameOrSeries
2323
import pandas.core.algorithms as algorithms
2424
from pandas.core.arrays import Categorical, ExtensionArray
2525
import pandas.core.common as com

pandas/core/groupby/ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from pandas._libs import NaT, iNaT, lib
1515
import pandas._libs.groupby as libgroupby
1616
import pandas._libs.reduction as libreduction
17+
from pandas._typing import FrameOrSeries
1718
from pandas.errors import AbstractMethodError
1819
from pandas.util._decorators import cache_readonly
1920

@@ -36,7 +37,6 @@
3637
)
3738
from pandas.core.dtypes.missing import _maybe_fill, isna
3839

39-
from pandas._typing import FrameOrSeries
4040
import pandas.core.algorithms as algorithms
4141
from pandas.core.base import SelectionMixin
4242
import pandas.core.common as com

pandas/core/indexes/category.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
from pandas._libs import index as libindex
99
from pandas._libs.hashtable import duplicated_int64
10+
from pandas._typing import AnyArrayLike
1011
import pandas.compat as compat
1112
from pandas.compat.numpy import function as nv
1213
from pandas.util._decorators import Appender, Substitution, cache_readonly
@@ -22,7 +23,6 @@
2223
from pandas.core.dtypes.generic import ABCCategorical, ABCSeries
2324
from pandas.core.dtypes.missing import isna
2425

25-
from pandas._typing import AnyArrayLike
2626
from pandas.core import accessor
2727
from pandas.core.algorithms import take_1d
2828
from pandas.core.arrays.categorical import Categorical, _recode_for_categories, contains

pandas/core/indexes/interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
from pandas._libs import Timedelta, Timestamp, lib
1111
from pandas._libs.interval import Interval, IntervalMixin, IntervalTree
12+
from pandas._typing import AnyArrayLike
1213
from pandas.util._decorators import Appender, Substitution, cache_readonly
1314
from pandas.util._exceptions import rewrite_exception
1415

@@ -36,7 +37,6 @@
3637
from pandas.core.dtypes.generic import ABCSeries
3738
from pandas.core.dtypes.missing import isna
3839

39-
from pandas._typing import AnyArrayLike
4040
from pandas.core.algorithms import take_1d
4141
from pandas.core.arrays.interval import IntervalArray, _interval_shared_docs
4242
import pandas.core.common as com

pandas/core/indexes/numeric.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import numpy as np
22

33
from pandas._libs import index as libindex, lib
4+
from pandas._typing import Dtype
45
from pandas.util._decorators import Appender, cache_readonly
56

67
from pandas.core.dtypes.cast import astype_nansafe
@@ -27,7 +28,6 @@
2728
)
2829
from pandas.core.dtypes.missing import isna
2930

30-
from pandas._typing import Dtype
3131
from pandas.core import algorithms
3232
import pandas.core.common as com
3333
from pandas.core.indexes.base import Index, InvalidIndexError, _index_shared_docs

pandas/core/ops/dispatch.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import numpy as np
77

8+
from pandas._typing import ArrayLike
9+
810
from pandas.core.dtypes.common import (
911
is_datetime64_dtype,
1012
is_extension_array_dtype,
@@ -15,7 +17,6 @@
1517
)
1618
from pandas.core.dtypes.generic import ABCExtensionArray, ABCSeries
1719

18-
from pandas._typing import ArrayLike
1920
from pandas.core.construction import array
2021

2122

pandas/core/reshape/merge.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
from pandas._libs import Timedelta, hashtable as libhashtable, lib
1515
import pandas._libs.join as libjoin
16+
from pandas._typing import FrameOrSeries
1617
from pandas.errors import MergeError
1718
from pandas.util._decorators import Appender, Substitution
1819

@@ -40,7 +41,6 @@
4041
from pandas.core.dtypes.missing import isna, na_value_for_dtype
4142

4243
from pandas import Categorical, Index, MultiIndex
43-
from pandas._typing import FrameOrSeries
4444
import pandas.core.algorithms as algos
4545
from pandas.core.arrays.categorical import _recode_for_categories
4646
import pandas.core.common as com

pandas/core/strings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import pandas._libs.lib as lib
1111
import pandas._libs.ops as libops
12+
from pandas._typing import ArrayLike, Dtype
1213
from pandas.util._decorators import Appender
1314

1415
from pandas.core.dtypes.common import (
@@ -32,7 +33,6 @@
3233
)
3334
from pandas.core.dtypes.missing import isna
3435

35-
from pandas._typing import ArrayLike, Dtype
3636
from pandas.core.algorithms import take_1d
3737
from pandas.core.base import NoNewAttributesMixin
3838
import pandas.core.common as com

pandas/core/tools/datetimes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
parse_time_string,
1616
)
1717
from pandas._libs.tslibs.strptime import array_strptime
18+
from pandas._typing import ArrayLike
1819

1920
from pandas.core.dtypes.common import (
2021
ensure_object,
@@ -37,7 +38,6 @@
3738
)
3839
from pandas.core.dtypes.missing import notna
3940

40-
from pandas._typing import ArrayLike
4141
from pandas.core import algorithms
4242
from pandas.core.algorithms import unique
4343

pandas/core/window/rolling.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import numpy as np
1212

1313
import pandas._libs.window.aggregations as window_aggregations
14+
from pandas._typing import Axis, FrameOrSeries, Scalar
1415
from pandas.compat._optional import import_optional_dependency
1516
from pandas.compat.numpy import function as nv
1617
from pandas.util._decorators import Appender, Substitution, cache_readonly
@@ -35,7 +36,6 @@
3536
ABCTimedeltaIndex,
3637
)
3738

38-
from pandas._typing import Axis, FrameOrSeries, Scalar
3939
from pandas.core.base import DataError, PandasObject, SelectionMixin, ShallowMixin
4040
import pandas.core.common as com
4141
from pandas.core.indexes.api import Index, ensure_index

pandas/io/common.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
)
3131
import zipfile
3232

33+
from pandas._typing import FilePathOrBuffer
3334
from pandas.compat import _get_lzma_file, _import_lzma
3435
from pandas.errors import ( # noqa
3536
AbstractMethodError,
@@ -41,8 +42,6 @@
4142

4243
from pandas.core.dtypes.common import is_file_like
4344

44-
from pandas._typing import FilePathOrBuffer
45-
4645
lzma = _import_lzma()
4746

4847

pandas/io/excel/_odfreader.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from typing import List
22

3+
from pandas._typing import FilePathOrBuffer, Scalar
34
from pandas.compat._optional import import_optional_dependency
45

56
import pandas as pd
6-
from pandas._typing import FilePathOrBuffer, Scalar
77

88
from pandas.io.excel._base import _BaseExcelReader
99

pandas/io/excel/_openpyxl.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import numpy as np
44

5-
from pandas.compat._optional import import_optional_dependency
6-
75
from pandas._typing import FilePathOrBuffer, Scalar
6+
from pandas.compat._optional import import_optional_dependency
87

98
from pandas.io.excel._base import ExcelWriter, _BaseExcelReader
109
from pandas.io.excel._util import _validate_freeze_panes

pandas/io/formats/format.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from pandas._libs.tslib import format_array_from_datetime
3939
from pandas._libs.tslibs import NaT, Timedelta, Timestamp, iNaT
4040
from pandas._libs.tslibs.nattype import NaTType
41+
from pandas._typing import FilePathOrBuffer
4142
from pandas.errors import AbstractMethodError
4243

4344
from pandas.core.dtypes.common import (
@@ -63,7 +64,6 @@
6364
)
6465
from pandas.core.dtypes.missing import isna, notna
6566

66-
from pandas._typing import FilePathOrBuffer
6767
from pandas.core.arrays.datetimes import DatetimeArray
6868
from pandas.core.arrays.timedeltas import TimedeltaArray
6969
from pandas.core.base import PandasObject

0 commit comments

Comments
 (0)