Skip to content

Commit 01b4de9

Browse files
streeckPingviinituutti
authored andcommitted
style: fix import format at pandas/core/computation (pandas-dev#23388)
1 parent 27c20b9 commit 01b4de9

File tree

11 files changed

+53
-50
lines changed

11 files changed

+53
-50
lines changed

pandas/core/computation/align.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
"""Core eval alignment algorithms
22
"""
33

4-
import warnings
54
from functools import partial, wraps
6-
from pandas.compat import zip, range
5+
import warnings
76

87
import numpy as np
98

9+
from pandas.compat import range, zip
10+
from pandas.errors import PerformanceWarning
11+
1012
import pandas as pd
1113
from pandas import compat
12-
from pandas.errors import PerformanceWarning
1314
import pandas.core.common as com
1415
from pandas.core.computation.common import _result_type_many
1516

pandas/core/computation/check.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import warnings
21
from distutils.version import LooseVersion
2+
import warnings
33

44
_NUMEXPR_INSTALLED = False
55
_MIN_NUMEXPR_VERSION = "2.6.1"

pandas/core/computation/common.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import numpy as np
2-
import pandas as pd
2+
33
from pandas.compat import reduce
44

5+
import pandas as pd
6+
57

68
def _ensure_decoded(s):
79
""" if we have bytes, decode them to unicode """

pandas/core/computation/engines.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
import abc
66

7-
from pandas import compat
87
from pandas.compat import map
9-
import pandas.io.formats.printing as printing
8+
9+
from pandas import compat
1010
from pandas.core.computation.align import _align, _reconstruct_object
1111
from pandas.core.computation.ops import (
12-
UndefinedVariableError,
13-
_mathops, _reductions)
12+
UndefinedVariableError, _mathops, _reductions)
1413

14+
import pandas.io.formats.printing as printing
1515

1616
_ne_builtins = frozenset(_mathops + _reductions)
1717

pandas/core/computation/eval.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
"""Top level ``eval`` module.
44
"""
55

6-
import warnings
76
import tokenize
8-
from pandas.io.formats.printing import pprint_thing
9-
from pandas.core.computation.scope import _ensure_scope
7+
import warnings
8+
109
from pandas.compat import string_types
11-
from pandas.core.computation.engines import _engines
1210
from pandas.util._validators import validate_bool_kwarg
1311

12+
from pandas.core.computation.engines import _engines
13+
from pandas.core.computation.scope import _ensure_scope
14+
15+
from pandas.io.formats.printing import pprint_thing
16+
1417

1518
def _check_engine(engine):
1619
"""Make sure a valid engine is passed.

pandas/core/computation/expr.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
"""
33

44
import ast
5+
from functools import partial
56
import tokenize
67

7-
from functools import partial
88
import numpy as np
99

10+
from pandas.compat import StringIO, lmap, reduce, string_types, zip
11+
1012
import pandas as pd
1113
from pandas import compat
12-
from pandas.compat import StringIO, lmap, zip, reduce, string_types
13-
from pandas.core.base import StringMixin
1414
from pandas.core import common as com
15-
import pandas.io.formats.printing as printing
16-
from pandas.core.reshape.util import compose
15+
from pandas.core.base import StringMixin
1716
from pandas.core.computation.ops import (
18-
_cmp_ops_syms, _bool_ops_syms,
19-
_arith_ops_syms, _unary_ops_syms, is_term)
20-
from pandas.core.computation.ops import _reductions, _mathops, _LOCAL_TAG
21-
from pandas.core.computation.ops import Op, BinOp, UnaryOp, Term, Constant, Div
22-
from pandas.core.computation.ops import UndefinedVariableError, FuncNode
17+
_LOCAL_TAG, BinOp, Constant, Div, FuncNode, Op, Term, UnaryOp,
18+
UndefinedVariableError, _arith_ops_syms, _bool_ops_syms, _cmp_ops_syms,
19+
_mathops, _reductions, _unary_ops_syms, is_term)
2320
from pandas.core.computation.scope import Scope
21+
from pandas.core.reshape.util import compose
22+
23+
import pandas.io.formats.printing as printing
2424

2525

2626
def tokenize_string(source):

pandas/core/computation/expressions.py

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

99
import warnings
10+
1011
import numpy as np
1112

1213
import pandas.core.common as com

pandas/core/computation/ops.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
"""Operator classes for eval.
22
"""
33

4-
import operator as op
5-
from functools import partial
64
from datetime import datetime
5+
from functools import partial
6+
import operator as op
77

88
import numpy as np
99

10+
from pandas.compat import PY3, string_types, text_type
11+
1012
from pandas.core.dtypes.common import is_list_like, is_scalar
13+
1114
import pandas as pd
12-
from pandas.compat import PY3, string_types, text_type
13-
import pandas.core.common as com
14-
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
1515
from pandas.core.base import StringMixin
16+
import pandas.core.common as com
1617
from pandas.core.computation.common import _ensure_decoded, _result_type_many
1718
from pandas.core.computation.scope import _DEFAULT_GLOBALS
1819

20+
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
1921

2022
_reductions = 'sum', 'prod'
2123

pandas/core/computation/pytables.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@
22

33
import ast
44
from functools import partial
5+
56
import numpy as np
6-
import pandas as pd
7+
8+
from pandas.compat import DeepChainMap, string_types, u
79

810
from pandas.core.dtypes.common import is_list_like
9-
import pandas.core.common as com
10-
from pandas.compat import u, string_types, DeepChainMap
11+
12+
import pandas as pd
1113
from pandas.core.base import StringMixin
12-
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
14+
import pandas.core.common as com
1315
from pandas.core.computation import expr, ops
14-
from pandas.core.computation.ops import is_term, UndefinedVariableError
15-
from pandas.core.computation.expr import BaseExprVisitor
1616
from pandas.core.computation.common import _ensure_decoded
17+
from pandas.core.computation.expr import BaseExprVisitor
18+
from pandas.core.computation.ops import UndefinedVariableError, is_term
1719
from pandas.core.tools.timedeltas import _coerce_scalar_to_timedelta_type
1820

21+
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
22+
1923

2024
class Scope(expr.Scope):
2125
__slots__ = 'queryables',

pandas/core/computation/scope.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
Module for scope operations
33
"""
44

5-
import sys
6-
import struct
7-
import inspect
85
import datetime
6+
import inspect
97
import itertools
108
import pprint
9+
import struct
10+
import sys
1111

1212
import numpy as np
1313

14-
import pandas
14+
from pandas.compat import DeepChainMap, StringIO, map
15+
1516
import pandas as pd # noqa
16-
from pandas.compat import DeepChainMap, map, StringIO
1717
from pandas.core.base import StringMixin
1818
import pandas.core.computation as compu
1919

@@ -48,7 +48,7 @@ def _raw_hex_id(obj):
4848

4949

5050
_DEFAULT_GLOBALS = {
51-
'Timestamp': pandas._libs.tslib.Timestamp,
51+
'Timestamp': pd._libs.tslib.Timestamp,
5252
'datetime': datetime.datetime,
5353
'True': True,
5454
'False': False,

setup.cfg

-10
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,6 @@ skip=
164164
pandas/core/sparse/series.py,
165165
pandas/core/sparse/frame.py,
166166
pandas/core/sparse/scipy_sparse.py,
167-
pandas/core/computation/check.py,
168-
pandas/core/computation/ops.py,
169-
pandas/core/computation/pytables.py,
170-
pandas/core/computation/eval.py,
171-
pandas/core/computation/expressions.py,
172-
pandas/core/computation/common.py,
173-
pandas/core/computation/engines.py,
174-
pandas/core/computation/expr.py,
175-
pandas/core/computation/align.py,
176-
pandas/core/computation/scope.py,
177167
pandas/tests/test_errors.py,
178168
pandas/tests/test_base.py,
179169
pandas/tests/test_register_accessor.py,

0 commit comments

Comments
 (0)