Skip to content

Commit db8d33e

Browse files
jbrockmendeljreback
jbrockmendel
authored and
jreback
committed
isort plotting, a handful of test dirs (pandas-dev#23957)
1 parent 0e7cf48 commit db8d33e

21 files changed

+149
-197
lines changed

‎pandas/plotting/_compat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# being a bit too dynamic
22
# pylint: disable=E1101
33
from __future__ import division
4-
import operator
54

65
from distutils.version import LooseVersion
6+
import operator
77

88

99
def _mpl_version(version, op):

‎pandas/plotting/_converter.py

+11-18
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,32 @@
1-
import warnings
2-
from datetime import datetime, timedelta
31
import datetime as pydt
4-
import numpy as np
2+
from datetime import datetime, timedelta
3+
import warnings
54

65
from dateutil.relativedelta import relativedelta
7-
8-
import matplotlib.units as units
96
import matplotlib.dates as dates
10-
11-
from matplotlib.ticker import Formatter, AutoLocator, Locator
7+
from matplotlib.ticker import AutoLocator, Formatter, Locator
128
from matplotlib.transforms import nonsingular
9+
import matplotlib.units as units
10+
import numpy as np
1311

1412
from pandas._libs import tslibs
1513
from pandas._libs.tslibs import resolution
14+
import pandas.compat as compat
15+
from pandas.compat import lrange
1616

1717
from pandas.core.dtypes.common import (
18-
is_float, is_integer,
19-
is_integer_dtype,
20-
is_float_dtype,
21-
is_datetime64_ns_dtype,
22-
is_period_arraylike,
23-
is_nested_list_like
24-
)
18+
is_datetime64_ns_dtype, is_float, is_float_dtype, is_integer,
19+
is_integer_dtype, is_nested_list_like, is_period_arraylike)
2520
from pandas.core.dtypes.generic import ABCSeries
2621

27-
from pandas.compat import lrange
28-
import pandas.compat as compat
2922
import pandas.core.common as com
3023
from pandas.core.index import Index
31-
3224
from pandas.core.indexes.datetimes import date_range
25+
from pandas.core.indexes.period import Period, PeriodIndex
3326
import pandas.core.tools.datetimes as tools
27+
3428
import pandas.tseries.frequencies as frequencies
3529
from pandas.tseries.frequencies import FreqGroup
36-
from pandas.core.indexes.period import Period, PeriodIndex
3730

3831
# constants
3932
HOURS_PER_DAY = 24.

‎pandas/plotting/_core.py

+16-23
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,35 @@
22
# pylint: disable=E1101
33
from __future__ import division
44

5-
import warnings
6-
import re
75
from collections import namedtuple
86
from distutils.version import LooseVersion
7+
import re
8+
import warnings
99

1010
import numpy as np
1111

12-
from pandas.util._decorators import cache_readonly, Appender
13-
from pandas.compat import range, lrange, map, zip, string_types
1412
import pandas.compat as compat
13+
from pandas.compat import lrange, map, range, string_types, zip
1514
from pandas.errors import AbstractMethodError
15+
from pandas.util._decorators import Appender, cache_readonly
1616

17-
import pandas.core.common as com
18-
from pandas.core.base import PandasObject
19-
from pandas.core.config import get_option
20-
from pandas.core.generic import _shared_docs, _shared_doc_kwargs
21-
22-
from pandas.core.dtypes.missing import isna, notna, remove_na_arraylike
2317
from pandas.core.dtypes.common import (
24-
is_list_like,
25-
is_integer,
26-
is_number,
27-
is_hashable,
28-
is_iterator)
18+
is_hashable, is_integer, is_iterator, is_list_like, is_number)
2919
from pandas.core.dtypes.generic import (
30-
ABCSeries, ABCDataFrame, ABCPeriodIndex, ABCMultiIndex, ABCIndexClass)
20+
ABCDataFrame, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex, ABCSeries)
21+
from pandas.core.dtypes.missing import isna, notna, remove_na_arraylike
3122

32-
from pandas.io.formats.printing import pprint_thing
23+
from pandas.core.base import PandasObject
24+
import pandas.core.common as com
25+
from pandas.core.config import get_option
26+
from pandas.core.generic import _shared_doc_kwargs, _shared_docs
3327

28+
from pandas.io.formats.printing import pprint_thing
3429
from pandas.plotting._compat import _mpl_ge_3_0_0
35-
from pandas.plotting._style import (plot_params,
36-
_get_standard_colors)
37-
from pandas.plotting._tools import (_subplots, _flatten, table,
38-
_handle_shared_axes, _get_all_lines,
39-
_get_xlim, _set_ticks_props,
40-
format_date_labels)
30+
from pandas.plotting._style import _get_standard_colors, plot_params
31+
from pandas.plotting._tools import (
32+
_flatten, _get_all_lines, _get_xlim, _handle_shared_axes, _set_ticks_props,
33+
_subplots, format_date_labels, table)
4134

4235
try:
4336
from pandas.plotting import _converter

‎pandas/plotting/_misc.py

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

55
import numpy as np
66

7+
from pandas.compat import lmap, lrange, range, zip
78
from pandas.util._decorators import deprecate_kwarg
8-
from pandas.core.dtypes.missing import notna
9-
from pandas.compat import range, lrange, lmap, zip
10-
from pandas.io.formats.printing import pprint_thing
119

10+
from pandas.core.dtypes.missing import notna
1211

12+
from pandas.io.formats.printing import pprint_thing
1313
from pandas.plotting._style import _get_standard_colors
14-
from pandas.plotting._tools import _subplots, _set_ticks_props
14+
from pandas.plotting._tools import _set_ticks_props, _subplots
1515

1616

1717
def scatter_matrix(frame, alpha=0.5, figsize=None, ax=None, grid=False,

‎pandas/plotting/_style.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
# pylint: disable=E1101
33
from __future__ import division
44

5-
import warnings
65
from contextlib import contextmanager
6+
import warnings
77

88
import numpy as np
99

10-
from pandas.core.dtypes.common import is_list_like
11-
from pandas.compat import lrange, lmap
1210
import pandas.compat as compat
11+
from pandas.compat import lmap, lrange
12+
13+
from pandas.core.dtypes.common import is_list_like
1314

1415

1516
def _get_standard_colors(num_colors=None, colormap=None, color_type='default',

‎pandas/plotting/_timeseries.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,21 @@
22

33
import functools
44

5-
import numpy as np
65
from matplotlib import pylab
6+
import numpy as np
77

88
from pandas._libs.tslibs.period import Period
9+
import pandas.compat as compat
910

1011
from pandas.core.dtypes.generic import (
11-
ABCPeriodIndex, ABCDatetimeIndex, ABCTimedeltaIndex)
12-
13-
from pandas.tseries.offsets import DateOffset
14-
import pandas.tseries.frequencies as frequencies
12+
ABCDatetimeIndex, ABCPeriodIndex, ABCTimedeltaIndex)
1513

1614
from pandas.io.formats.printing import pprint_thing
17-
import pandas.compat as compat
18-
19-
from pandas.plotting._converter import (TimeSeries_DateLocator,
20-
TimeSeries_DateFormatter,
21-
TimeSeries_TimedeltaFormatter)
15+
from pandas.plotting._converter import (
16+
TimeSeries_DateFormatter, TimeSeries_DateLocator,
17+
TimeSeries_TimedeltaFormatter)
18+
import pandas.tseries.frequencies as frequencies
19+
from pandas.tseries.offsets import DateOffset
2220

2321
# ---------------------------------------------------------------------
2422
# Plotting functions and monkey patches

‎pandas/plotting/_tools.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
# pylint: disable=E1101
33
from __future__ import division
44

5-
import warnings
65
from math import ceil
6+
import warnings
77

88
import numpy as np
99

10-
from pandas.core.dtypes.common import is_list_like
11-
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass, ABCDataFrame
1210
from pandas.compat import range
1311

12+
from pandas.core.dtypes.common import is_list_like
13+
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
14+
1415

1516
def format_date_labels(ax, rot):
1617
# mini version of autofmt_xdate

‎pandas/tests/generic/test_frame.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
# -*- coding: utf-8 -*-
22
# pylint: disable-msg=E1101,W0612
33

4-
from operator import methodcaller
54
from copy import deepcopy
65
from distutils.version import LooseVersion
6+
from operator import methodcaller
77

8-
import pytest
98
import numpy as np
10-
import pandas as pd
11-
12-
from pandas import Series, DataFrame, date_range, MultiIndex
9+
import pytest
1310

1411
from pandas.compat import range
15-
from pandas.util.testing import (assert_series_equal,
16-
assert_frame_equal,
17-
assert_almost_equal)
12+
import pandas.util._test_decorators as td
1813

14+
import pandas as pd
15+
from pandas import DataFrame, MultiIndex, Series, date_range
1916
import pandas.util.testing as tm
20-
import pandas.util._test_decorators as td
17+
from pandas.util.testing import (
18+
assert_almost_equal, assert_frame_equal, assert_series_equal)
19+
2120
from .test_generic import Generic
2221

2322
try:

‎pandas/tests/generic/test_generic.py

+9-11
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,25 @@
44
from copy import copy, deepcopy
55
from warnings import catch_warnings, simplefilter
66

7-
import pytest
87
import numpy as np
9-
import pandas as pd
10-
11-
from pandas.core.dtypes.common import is_scalar
12-
from pandas import (Series, DataFrame, Panel,
13-
date_range, MultiIndex)
8+
import pytest
149

15-
import pandas.io.formats.printing as printing
10+
from pandas.compat import PY3, range, zip
1611

17-
from pandas.compat import range, zip, PY3
18-
from pandas.util.testing import (assert_series_equal,
19-
assert_panel_equal,
20-
assert_frame_equal)
12+
from pandas.core.dtypes.common import is_scalar
2113

14+
import pandas as pd
15+
from pandas import DataFrame, MultiIndex, Panel, Series, date_range
2216
import pandas.util.testing as tm
17+
from pandas.util.testing import (
18+
assert_frame_equal, assert_panel_equal, assert_series_equal)
2319

20+
import pandas.io.formats.printing as printing
2421

2522
# ----------------------------------------------------------------------
2623
# Generic types test cases
2724

25+
2826
class Generic(object):
2927

3028
@property

‎pandas/tests/generic/test_label_or_level_utils.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import pytest
2+
3+
from pandas.core.dtypes.missing import array_equivalent
4+
25
import pandas as pd
36
import pandas.util.testing as tm
4-
from pandas.core.dtypes.missing import array_equivalent
57

68

79
# Fixtures

‎pandas/tests/generic/test_panel.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
from warnings import catch_warnings, simplefilter
55

6-
from pandas import Panel
7-
from pandas.util.testing import (assert_panel_equal,
8-
assert_almost_equal)
6+
import pandas.util._test_decorators as td
97

8+
from pandas import Panel
109
import pandas.util.testing as tm
11-
import pandas.util._test_decorators as td
10+
from pandas.util.testing import assert_almost_equal, assert_panel_equal
11+
1212
from .test_generic import Generic
1313

1414

‎pandas/tests/generic/test_series.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# -*- coding: utf-8 -*-
22
# pylint: disable-msg=E1101,W0612
33

4+
from distutils.version import LooseVersion
45
from operator import methodcaller
56

6-
import pytest
77
import numpy as np
8-
import pandas as pd
9-
10-
from distutils.version import LooseVersion
11-
from pandas import Series, date_range, MultiIndex
8+
import pytest
129

1310
from pandas.compat import range
14-
from pandas.util.testing import (assert_series_equal,
15-
assert_almost_equal)
11+
import pandas.util._test_decorators as td
1612

13+
import pandas as pd
14+
from pandas import MultiIndex, Series, date_range
1715
import pandas.util.testing as tm
18-
import pandas.util._test_decorators as td
16+
from pandas.util.testing import assert_almost_equal, assert_series_equal
17+
1918
from .test_generic import Generic
2019

2120
try:

‎pandas/tests/tseries/offsets/conftest.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pytest
2+
23
import pandas.tseries.offsets as offsets
34

45

‎pandas/tests/tseries/offsets/test_fiscal.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
from dateutil.relativedelta import relativedelta
88
import pytest
99

10+
from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG
11+
1012
from pandas import Timestamp
13+
1114
from pandas.tseries.frequencies import get_offset
12-
from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG
13-
from pandas.tseries.offsets import FY5253Quarter, FY5253
15+
from pandas.tseries.offsets import FY5253, FY5253Quarter
1416

1517
from .common import assert_offset_equal, assert_onOffset
1618
from .test_offsets import Base, WeekDay

0 commit comments

Comments
 (0)