Skip to content

Commit d93f6ed

Browse files
jbrockmendelPingviinituutti
authored andcommitted
STY: isort tests/scalar, tests/tslibs, import libwindow instead of _window (pandas-dev#23787)
1 parent ebbca06 commit d93f6ed

26 files changed

+238
-284
lines changed

pandas/core/window.py

+44-55
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,29 @@
77
"""
88
from __future__ import division
99

10-
import warnings
11-
import numpy as np
1210
from collections import defaultdict
1311
from datetime import timedelta
12+
from textwrap import dedent
13+
import warnings
14+
15+
import numpy as np
16+
17+
import pandas._libs.window as libwindow
18+
import pandas.compat as compat
19+
from pandas.compat.numpy import function as nv
20+
from pandas.util._decorators import Appender, Substitution, cache_readonly
1421

15-
from pandas.core.dtypes.generic import (
16-
ABCSeries,
17-
ABCDataFrame,
18-
ABCDatetimeIndex,
19-
ABCTimedeltaIndex,
20-
ABCPeriodIndex,
21-
ABCDateOffset)
2222
from pandas.core.dtypes.common import (
23-
is_integer,
24-
is_bool,
25-
is_float_dtype,
26-
is_integer_dtype,
27-
needs_i8_conversion,
28-
is_timedelta64_dtype,
29-
is_list_like,
30-
ensure_float64,
31-
is_scalar)
23+
ensure_float64, is_bool, is_float_dtype, is_integer, is_integer_dtype,
24+
is_list_like, is_scalar, is_timedelta64_dtype, needs_i8_conversion)
25+
from pandas.core.dtypes.generic import (
26+
ABCDataFrame, ABCDateOffset, ABCDatetimeIndex, ABCPeriodIndex, ABCSeries,
27+
ABCTimedeltaIndex)
3228

3329
from pandas.core.base import PandasObject, SelectionMixin
34-
from pandas.core.groupby.base import GroupByMixin
3530
import pandas.core.common as com
36-
import pandas._libs.window as _window
37-
38-
from pandas import compat
39-
from pandas.compat.numpy import function as nv
40-
from pandas.util._decorators import (Substitution, Appender,
41-
cache_readonly)
4231
from pandas.core.generic import _shared_docs
43-
from textwrap import dedent
44-
32+
from pandas.core.groupby.base import GroupByMixin
4533

4634
_shared_docs = dict(**_shared_docs)
4735
_doc_template = """
@@ -688,10 +676,10 @@ def _apply_window(self, mean=True, **kwargs):
688676

689677
def f(arg, *args, **kwargs):
690678
minp = _use_window(self.min_periods, len(window))
691-
return _window.roll_window(np.concatenate((arg,
692-
additional_nans))
693-
if center else arg, window, minp,
694-
avg=mean)
679+
return libwindow.roll_window(np.concatenate((arg,
680+
additional_nans))
681+
if center else arg, window, minp,
682+
avg=mean)
695683

696684
result = np.apply_along_axis(f, self.axis, values)
697685

@@ -848,10 +836,10 @@ def _apply(self, func, name=None, window=None, center=None,
848836

849837
# if we have a string function name, wrap it
850838
if isinstance(func, compat.string_types):
851-
cfunc = getattr(_window, func, None)
839+
cfunc = getattr(libwindow, func, None)
852840
if cfunc is None:
853841
raise ValueError("we do not support this function "
854-
"in _window.{0}".format(func))
842+
"in libwindow.{func}".format(func=func))
855843

856844
def func(arg, window, min_periods=None, closed=None):
857845
minp = check_minp(min_periods, window)
@@ -995,7 +983,7 @@ def f(arg, window, min_periods, closed):
995983
minp = _use_window(min_periods, window)
996984
if not raw:
997985
arg = Series(arg, index=self.obj.index)
998-
return _window.roll_generic(
986+
return libwindow.roll_generic(
999987
arg, window, minp, indexi,
1000988
closed, offset, func, raw, args, kwargs)
1001989

@@ -1160,8 +1148,8 @@ def std(self, ddof=1, *args, **kwargs):
11601148

11611149
def f(arg, *args, **kwargs):
11621150
minp = _require_min_periods(1)(self.min_periods, window)
1163-
return _zsqrt(_window.roll_var(arg, window, minp, indexi,
1164-
self.closed, ddof))
1151+
return _zsqrt(libwindow.roll_var(arg, window, minp, indexi,
1152+
self.closed, ddof))
11651153

11661154
return self._apply(f, 'std', check_minp=_require_min_periods(1),
11671155
ddof=ddof, **kwargs)
@@ -1331,15 +1319,15 @@ def quantile(self, quantile, interpolation='linear', **kwargs):
13311319
def f(arg, *args, **kwargs):
13321320
minp = _use_window(self.min_periods, window)
13331321
if quantile == 1.0:
1334-
return _window.roll_max(arg, window, minp, indexi,
1335-
self.closed)
1322+
return libwindow.roll_max(arg, window, minp, indexi,
1323+
self.closed)
13361324
elif quantile == 0.0:
1337-
return _window.roll_min(arg, window, minp, indexi,
1338-
self.closed)
1325+
return libwindow.roll_min(arg, window, minp, indexi,
1326+
self.closed)
13391327
else:
1340-
return _window.roll_quantile(arg, window, minp, indexi,
1341-
self.closed, quantile,
1342-
interpolation)
1328+
return libwindow.roll_quantile(arg, window, minp, indexi,
1329+
self.closed, quantile,
1330+
interpolation)
13431331

13441332
return self._apply(f, 'quantile', quantile=quantile,
13451333
**kwargs)
@@ -2262,10 +2250,10 @@ def _apply(self, func, **kwargs):
22622250

22632251
# if we have a string function name, wrap it
22642252
if isinstance(func, compat.string_types):
2265-
cfunc = getattr(_window, func, None)
2253+
cfunc = getattr(libwindow, func, None)
22662254
if cfunc is None:
22672255
raise ValueError("we do not support this function "
2268-
"in _window.{0}".format(func))
2256+
"in libwindow.{func}".format(func=func))
22692257

22702258
def func(arg):
22712259
return cfunc(arg, self.com, int(self.adjust),
@@ -2300,9 +2288,9 @@ def var(self, bias=False, *args, **kwargs):
23002288
nv.validate_window_func('var', args, kwargs)
23012289

23022290
def f(arg):
2303-
return _window.ewmcov(arg, arg, self.com, int(self.adjust),
2304-
int(self.ignore_na), int(self.min_periods),
2305-
int(bias))
2291+
return libwindow.ewmcov(arg, arg, self.com, int(self.adjust),
2292+
int(self.ignore_na), int(self.min_periods),
2293+
int(bias))
23062294

23072295
return self._apply(f, **kwargs)
23082296

@@ -2320,9 +2308,10 @@ def cov(self, other=None, pairwise=None, bias=False, **kwargs):
23202308
def _get_cov(X, Y):
23212309
X = self._shallow_copy(X)
23222310
Y = self._shallow_copy(Y)
2323-
cov = _window.ewmcov(X._prep_values(), Y._prep_values(), self.com,
2324-
int(self.adjust), int(self.ignore_na),
2325-
int(self.min_periods), int(bias))
2311+
cov = libwindow.ewmcov(X._prep_values(), Y._prep_values(),
2312+
self.com, int(self.adjust),
2313+
int(self.ignore_na), int(self.min_periods),
2314+
int(bias))
23262315
return X._wrap_result(cov)
23272316

23282317
return _flex_binary_moment(self._selected_obj, other._selected_obj,
@@ -2344,10 +2333,10 @@ def _get_corr(X, Y):
23442333
Y = self._shallow_copy(Y)
23452334

23462335
def _cov(x, y):
2347-
return _window.ewmcov(x, y, self.com, int(self.adjust),
2348-
int(self.ignore_na),
2349-
int(self.min_periods),
2350-
1)
2336+
return libwindow.ewmcov(x, y, self.com, int(self.adjust),
2337+
int(self.ignore_na),
2338+
int(self.min_periods),
2339+
1)
23512340

23522341
x_values = X._prep_values()
23532342
y_values = Y._prep_values()

pandas/tests/scalar/interval/test_interval.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from __future__ import division
22

33
import numpy as np
4-
from pandas import Interval, Timestamp, Timedelta
5-
import pandas.core.common as com
6-
74
import pytest
85

6+
from pandas import Interval, Timedelta, Timestamp
7+
import pandas.core.common as com
8+
99

1010
@pytest.fixture
1111
def interval():

pandas/tests/scalar/period/test_asfreq.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import pytest
22

3+
from pandas._libs.tslibs.frequencies import (
4+
INVALID_FREQ_ERR_MSG, _period_code_map)
35
from pandas.errors import OutOfBoundsDatetime
46

5-
import pandas as pd
67
from pandas import Period, offsets
78
from pandas.util import testing as tm
8-
from pandas._libs.tslibs.frequencies import _period_code_map
99

1010

1111
class TestFreqConversion(object):
@@ -328,13 +328,13 @@ def test_conv_weekly(self):
328328

329329
assert ival_W.asfreq('W') == ival_W
330330

331-
msg = pd._libs.tslibs.frequencies.INVALID_FREQ_ERR_MSG
331+
msg = INVALID_FREQ_ERR_MSG
332332
with pytest.raises(ValueError, match=msg):
333333
ival_W.asfreq('WK')
334334

335335
def test_conv_weekly_legacy(self):
336336
# frequency conversion tests: from Weekly Frequency
337-
msg = pd._libs.tslibs.frequencies.INVALID_FREQ_ERR_MSG
337+
msg = INVALID_FREQ_ERR_MSG
338338
with pytest.raises(ValueError, match=msg):
339339
Period(freq='WK', year=2007, month=1, day=1)
340340

@@ -741,11 +741,11 @@ def test_asfreq_MS(self):
741741

742742
assert initial.asfreq(freq="M", how="S") == Period('2013-01', 'M')
743743

744-
msg = pd._libs.tslibs.frequencies.INVALID_FREQ_ERR_MSG
744+
msg = INVALID_FREQ_ERR_MSG
745745
with pytest.raises(ValueError, match=msg):
746746
initial.asfreq(freq="MS", how="S")
747747

748748
with pytest.raises(ValueError, match=msg):
749-
pd.Period('2013-01', 'MS')
749+
Period('2013-01', 'MS')
750750

751751
assert _period_code_map.get("MS") is None

pandas/tests/scalar/period/test_period.py

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
import pytest
1+
from datetime import date, datetime, timedelta
22

3-
import pytz
43
import numpy as np
5-
from datetime import datetime, date, timedelta
6-
7-
import pandas as pd
8-
from pandas import Timedelta, NaT, Period, Timestamp, offsets
9-
import pandas.util.testing as tm
10-
import pandas.core.indexes.period as period
11-
from pandas.compat import text_type, iteritems
12-
from pandas.compat.numpy import np_datetime64_compat
4+
import pytest
5+
import pytz
136

147
from pandas._libs.tslibs import iNaT, period as libperiod
158
from pandas._libs.tslibs.ccalendar import DAYS, MONTHS
9+
from pandas._libs.tslibs.frequencies import INVALID_FREQ_ERR_MSG
1610
from pandas._libs.tslibs.parsing import DateParseError
1711
from pandas._libs.tslibs.timezones import dateutil_gettz, maybe_get_tz
12+
from pandas.compat import iteritems, text_type
13+
from pandas.compat.numpy import np_datetime64_compat
14+
15+
import pandas as pd
16+
from pandas import NaT, Period, Timedelta, Timestamp, offsets
17+
import pandas.core.indexes.period as period
18+
import pandas.util.testing as tm
1819

1920

2021
class TestPeriodConstruction(object):
@@ -712,7 +713,7 @@ def test_period_deprecated_freq(self):
712713
"U": ["MICROSECOND", "MICROSECONDLY", "microsecond"],
713714
"N": ["NANOSECOND", "NANOSECONDLY", "nanosecond"]}
714715

715-
msg = pd._libs.tslibs.frequencies.INVALID_FREQ_ERR_MSG
716+
msg = INVALID_FREQ_ERR_MSG
716717
for exp, freqs in iteritems(cases):
717718
for freq in freqs:
718719
with pytest.raises(ValueError, match=msg):
@@ -851,7 +852,7 @@ def test_properties_weekly_legacy(self):
851852
exp = Period(freq='W', year=2012, month=2, day=1)
852853
assert exp.days_in_month == 29
853854

854-
msg = pd._libs.tslibs.frequencies.INVALID_FREQ_ERR_MSG
855+
msg = INVALID_FREQ_ERR_MSG
855856
with pytest.raises(ValueError, match=msg):
856857
Period(freq='WK', year=2007, month=1, day=7)
857858

pandas/tests/scalar/test_nat.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
import pytest
2-
31
from datetime import datetime, timedelta
4-
import pytz
52

63
import numpy as np
7-
from pandas import (NaT, Index, Timestamp, Timedelta, Period,
8-
DatetimeIndex,
9-
TimedeltaIndex, Series, isna)
4+
import pytest
5+
import pytz
6+
7+
from pandas._libs.tslib import iNaT
8+
9+
from pandas import (
10+
DatetimeIndex, Index, NaT, Period, Series, Timedelta, TimedeltaIndex,
11+
Timestamp, isna)
1012
from pandas.core.arrays import PeriodArray
1113
from pandas.util import testing as tm
12-
from pandas._libs.tslib import iNaT
1314

1415

1516
@pytest.mark.parametrize('nat, idx', [(Timestamp('NaT'), DatetimeIndex),

0 commit comments

Comments
 (0)