Skip to content

STYLE fix: pylint "consider-using-from" #49335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas/_libs/parsers.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ from pandas._libs.util cimport (
UINT64_MAX,
)

import pandas._libs.lib as lib
from pandas._libs import lib

from pandas._libs.khash cimport (
kh_destroy_float64,
Expand Down
2 changes: 1 addition & 1 deletion pandas/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,7 @@ def any_skipna_inferred_dtype(request):

Examples
--------
>>> import pandas._libs.lib as lib
>>> from pandas._libs import lib
>>>
>>> def test_something(any_skipna_inferred_dtype):
... inferred_dtype, values = any_skipna_inferred_dtype
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/arrays/categorical.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@
)

from pandas.core import (
algorithms,
arraylike,
ops,
)
from pandas.core.accessor import (
PandasDelegate,
delegate_names,
)
import pandas.core.algorithms as algorithms
from pandas.core.algorithms import (
factorize,
take_nd,
Expand Down
8 changes: 5 additions & 3 deletions pandas/core/arrays/sparse/array.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@
notna,
)

from pandas.core import arraylike
from pandas.core import (
arraylike,
ops,
)
import pandas.core.algorithms as algos
from pandas.core.array_algos.quantile import quantile_with_mask
from pandas.core.arraylike import OpsMixin
Expand All @@ -96,9 +99,8 @@
)
from pandas.core.missing import interpolate_2d
from pandas.core.nanops import check_below_min_count
import pandas.core.ops as ops

import pandas.io.formats.printing as printing
from pandas.io.formats import printing

# See https://github.com/python/typing/issues/684
if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import numpy as np

import pandas._libs.lib as lib
from pandas._libs import lib
from pandas._typing import (
Axis,
AxisInt,
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/computation/engines.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
REDUCTIONS,
)

import pandas.io.formats.printing as printing
from pandas.io.formats import printing

if TYPE_CHECKING:
from pandas.core.computation.expr import Expr
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/computation/expr.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
)
from pandas.core.computation.scope import Scope

import pandas.io.formats.printing as printing
from pandas.io.formats import printing


def _rewrite_assign(tok: tuple[int, str]) -> tuple[int, str]:
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/construction.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import warnings

import numpy as np
import numpy.ma as ma
from numpy import ma

from pandas._libs import lib
from pandas._libs.tslibs.period import Period
Expand Down
8 changes: 4 additions & 4 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import warnings

import numpy as np
import numpy.ma as ma
from numpy import ma

from pandas._config import get_option

Expand Down Expand Up @@ -685,7 +685,7 @@ def __init__(
# GH#38939 de facto copy defaults to False only in non-dict cases
mgr = dict_to_mgr(data, index, columns, dtype=dtype, copy=copy, typ=manager)
elif isinstance(data, ma.MaskedArray):
import numpy.ma.mrecords as mrecords
from numpy.ma import mrecords

# masked recarray
if isinstance(data, mrecords.MaskedRecords):
Expand Down Expand Up @@ -8036,7 +8036,7 @@ def combine_first(self, other: DataFrame) -> DataFrame:
1 0.0 3.0 1.0
2 NaN 3.0 1.0
"""
import pandas.core.computation.expressions as expressions
from pandas.core.computation import expressions

def combiner(x, y):
mask = extract_array(isna(x))
Expand Down Expand Up @@ -8179,7 +8179,7 @@ def update(
1 2 500.0
2 3 6.0
"""
import pandas.core.computation.expressions as expressions
from pandas.core.computation import expressions

# TODO: Support other joins
if join != "left": # pragma: no cover
Expand Down
8 changes: 5 additions & 3 deletions pandas/core/groupby/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,12 @@ class providing the base-class of operations.
notna,
)

from pandas.core import nanops
from pandas.core import (
algorithms,
nanops,
sample,
)
from pandas.core._numba import executor
import pandas.core.algorithms as algorithms
from pandas.core.arrays import (
BaseMaskedArray,
BooleanArray,
Expand Down Expand Up @@ -121,7 +124,6 @@ class providing the base-class of operations.
RangeIndex,
)
from pandas.core.internals.blocks import ensure_block_shape
import pandas.core.sample as sample
from pandas.core.series import Series
from pandas.core.sorting import get_group_index_sorter
from pandas.core.util.numba_ import (
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/groupby/grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
is_scalar,
)

import pandas.core.algorithms as algorithms
from pandas.core import algorithms
from pandas.core.arrays import (
Categorical,
ExtensionArray,
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/internals/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
na_value_for_dtype,
)

from pandas.core import missing
import pandas.core.algorithms as algos
from pandas.core.array_algos.putmask import (
extract_bool_array,
Expand Down Expand Up @@ -104,13 +105,12 @@
from pandas.core.arrays.sparse import SparseDtype
from pandas.core.base import PandasObject
import pandas.core.common as com
import pandas.core.computation.expressions as expressions
from pandas.core.computation import expressions
from pandas.core.construction import (
ensure_wrapped_if_datetimelike,
extract_array,
)
from pandas.core.indexers import check_setitem_lengths
import pandas.core.missing as missing

if TYPE_CHECKING:
from pandas import (
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/internals/construction.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import warnings

import numpy as np
import numpy.ma as ma
from numpy import ma

from pandas._libs import lib
from pandas._typing import (
Expand Down
30 changes: 15 additions & 15 deletions pandas/core/nanops.py
Original file line number Diff line number Diff line change
Expand Up @@ -519,12 +519,12 @@ def nanany(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, 2])
>>> nanops.nanany(s)
True

>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([np.nan])
>>> nanops.nanany(s)
False
Expand Down Expand Up @@ -565,12 +565,12 @@ def nanall(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, 2, np.nan])
>>> nanops.nanall(s)
True

>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, 0])
>>> nanops.nanall(s)
False
Expand Down Expand Up @@ -616,7 +616,7 @@ def nansum(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, 2, np.nan])
>>> nanops.nansum(s)
3.0
Expand Down Expand Up @@ -684,7 +684,7 @@ def nanmean(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, 2, np.nan])
>>> nanops.nanmean(s)
1.5
Expand Down Expand Up @@ -740,7 +740,7 @@ def nanmedian(values, *, axis: AxisInt | None = None, skipna: bool = True, mask=

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, np.nan, 2, 2])
>>> nanops.nanmedian(s)
2.0
Expand Down Expand Up @@ -901,7 +901,7 @@ def nanstd(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, np.nan, 2, 3])
>>> nanops.nanstd(s)
1.0
Expand Down Expand Up @@ -948,7 +948,7 @@ def nanvar(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, np.nan, 2, 3])
>>> nanops.nanvar(s)
1.0
Expand Down Expand Up @@ -1023,7 +1023,7 @@ def nansem(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, np.nan, 2, 3])
>>> nanops.nansem(s)
0.5773502691896258
Expand Down Expand Up @@ -1100,7 +1100,7 @@ def nanargmax(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> arr = np.array([1, 2, 3, np.nan, 4])
>>> nanops.nanargmax(arr)
4
Expand Down Expand Up @@ -1146,7 +1146,7 @@ def nanargmin(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> arr = np.array([1, 2, 3, np.nan, 4])
>>> nanops.nanargmin(arr)
0
Expand Down Expand Up @@ -1200,7 +1200,7 @@ def nanskew(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, np.nan, 1, 2])
>>> nanops.nanskew(s)
1.7320508075688787
Expand Down Expand Up @@ -1288,7 +1288,7 @@ def nankurt(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, np.nan, 1, 3, 2])
>>> nanops.nankurt(s)
-1.2892561983471076
Expand Down Expand Up @@ -1380,7 +1380,7 @@ def nanprod(

Examples
--------
>>> import pandas.core.nanops as nanops
>>> from pandas.core import nanops
>>> s = pd.Series([1, 2, 3, np.nan])
>>> nanops.nanprod(s)
6.0
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/ops/array_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
notna,
)

import pandas.core.computation.expressions as expressions
from pandas.core.computation import expressions
from pandas.core.construction import ensure_wrapped_if_datetimelike
from pandas.core.ops import (
missing,
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/reshape/tile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
to_datetime,
to_timedelta,
)
from pandas.core import nanops
import pandas.core.algorithms as algos
import pandas.core.nanops as nanops


def cut(
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/strings/accessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import numpy as np

import pandas._libs.lib as lib
from pandas._libs import lib
from pandas._typing import (
AlignJoin,
DtypeObj,
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/strings/object_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import numpy as np

import pandas._libs.lib as lib
from pandas._libs import lib
import pandas._libs.missing as libmissing
import pandas._libs.ops as libops
from pandas._typing import (
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/window/ewm.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
)
from pandas.core.dtypes.missing import isna

import pandas.core.common as common # noqa: PDF018
from pandas.core import common # noqa: PDF018
from pandas.core.indexers.objects import (
BaseIndexer,
ExponentialMovingWindowIndexer,
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/excel/_odswriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
cast,
)

import pandas._libs.json as json
from pandas._libs import json
from pandas._typing import (
FilePath,
StorageOptions,
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/excel/_xlsxwriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Any,
)

import pandas._libs.json as json
from pandas._libs import json
from pandas._typing import (
FilePath,
StorageOptions,
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/json/_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import numpy as np

import pandas._libs.json as json
from pandas._libs import json
from pandas._libs.tslibs import iNaT
from pandas._typing import (
CompressionOptions,
Expand Down
Loading