Skip to content

Commit 275c653

Browse files
elmq0022elmq0022
committed
linting after fixes
1 parent 6966e16 commit 275c653

14 files changed

+52
-104
lines changed

‎pandas/tests/indexes/multi/test_compat.py

+3-12
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,10 @@
22

33

44
import numpy as np
5-
import pandas as pd
65
import pandas.util.testing as tm
76
import pytest
8-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
9-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
10-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
11-
isna)
12-
from pandas._libs.tslib import iNaT
13-
from pandas.compat import PY3
14-
from pandas.core.indexes.base import InvalidIndexError
15-
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
16-
from pandas.compat import PY3, PYPY, lrange, lzip, range, u, long
17-
import numpy as np
18-
7+
from pandas import MultiIndex
8+
from pandas.compat import PY3, long
199

2010

2111
def test_numeric_compat(idx):
@@ -129,6 +119,7 @@ def test_ndarray_compat_properties(idx, _compat_props):
129119
def test_compat(indices):
130120
assert indices.tolist() == list(indices)
131121

122+
132123
def test_pickle_compat_construction(_holder):
133124
# this is testing for pickle compat
134125
if _holder is None:

‎pandas/tests/indexes/multi/test_constructor.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -487,18 +487,19 @@ def test_create_index_existing_name(idx):
487487
result = pd.Index(index)
488488
tm.assert_index_equal(
489489
result, Index(Index([('foo', 'one'), ('foo', 'two'),
490-
('bar', 'one'), ('baz', 'two'),
491-
('qux', 'one'), ('qux', 'two')],
490+
('bar', 'one'), ('baz', 'two'),
491+
('qux', 'one'), ('qux', 'two')],
492492
dtype='object'),
493-
names=['foo', 'bar']))
493+
names=['foo', 'bar']))
494494

495495
result = pd.Index(index, names=['A', 'B'])
496496
tm.assert_index_equal(
497497
result,
498498
Index(Index([('foo', 'one'), ('foo', 'two'), ('bar', 'one'),
499-
('baz', 'two'), ('qux', 'one'), ('qux', 'two')],
499+
('baz', 'two'), ('qux', 'one'), ('qux', 'two')],
500500
dtype='object'), names=['A', 'B']))
501501

502+
502503
def test_tuples_with_name_string():
503504
# GH 15110 and GH 14848
504505

‎pandas/tests/indexes/multi/test_contains.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# -*- coding: utf-8 -*-
22

3-
import pandas as pd
4-
from pandas import MultiIndex
5-
import pytest
6-
from pandas.compat import PY3, PYPY, lrange, lzip, range, u
73
import numpy as np
4+
import pandas as pd
85
import pandas.util.testing as tm
6+
import pytest
7+
from pandas import Int64Index, MultiIndex, PeriodIndex, UInt64Index
8+
from pandas.compat import PYPY
9+
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin, iNaT
910

1011

1112
def test_contains_top_level():

‎pandas/tests/indexes/multi/test_copy.py

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
11
# -*- coding: utf-8 -*-
22

33

4-
import numpy as np
5-
import pandas as pd
64
import pandas.util.testing as tm
7-
import pytest
8-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
9-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
10-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
11-
isna)
12-
from pandas._libs.tslib import iNaT
13-
from pandas.compat import PY3
14-
from pandas.core.indexes.base import InvalidIndexError
15-
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
5+
from pandas import (CategoricalIndex, IntervalIndex, MultiIndex, PeriodIndex,
6+
RangeIndex, Series, compat)
167

178

189
def assert_multiindex_copied(copy, original):

‎pandas/tests/indexes/multi/test_equivalence.py

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
# -*- coding: utf-8 -*-
22

3-
import warnings
4-
from itertools import product
53

64
import numpy as np
75
import pandas as pd
86
import pandas.util.testing as tm
9-
import pytest
10-
from pandas import (CategoricalIndex, DataFrame, DatetimeIndex, Float64Index,
11-
Index, Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
12-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
13-
date_range, isna, period_range)
14-
from pandas._libs.tslib import iNaT
15-
from pandas.compat import PY3, PYPY, lrange, lzip, range, u
16-
from pandas.core.dtypes.dtypes import CategoricalDtype
17-
from pandas.core.indexes.base import InvalidIndexError
18-
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
19-
from pandas.util.testing import assert_copy
7+
from pandas import (Index, MultiIndex, PeriodIndex, RangeIndex, Series, compat,
8+
isna)
9+
from pandas.compat import lrange, lzip, range
2010

2111

2212
def test_equals(named_index):

‎pandas/tests/indexes/multi/test_get_set.py

+4-9
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@
55
import pandas as pd
66
import pandas.util.testing as tm
77
import pytest
8-
from pandas import CategoricalIndex, Index, MultiIndex
9-
from pandas.compat import range
10-
from pandas.compat import PY3, PYPY, lrange, lzip, range, u
11-
from pandas.util.testing import assert_almost_equal
8+
from pandas import CategoricalIndex, Index, IntervalIndex, MultiIndex
9+
from pandas.compat import lrange, range
1210
from pandas.core.indexes.base import InvalidIndexError
13-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
14-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
15-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
16-
isna)
11+
from pandas.util.testing import assert_almost_equal
1712

1813

1914
def test_get_loc(idx):
@@ -312,7 +307,7 @@ def assert_matching(actual, expected, check_dtype=False):
312307

313308
with tm.assert_raises_regex(ValueError, "^On"):
314309
idx.set_labels([0, 1, 2, 3, 4, 5], level=0,
315-
inplace=inplace)
310+
inplace=inplace)
316311
assert_matching(idx.labels, original_index.labels,
317312
check_dtype=True)
318313

‎pandas/tests/indexes/multi/test_indexing.py

+3-9
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@
44
from datetime import timedelta
55

66
import numpy as np
7-
import pandas as pd
87
import pandas.util.testing as tm
98
import pytest
10-
from pandas import Index, MultiIndex
9+
from pandas import (Index, Int64Index, MultiIndex, PeriodIndex, RangeIndex,
10+
UInt64Index, compat)
1111
from pandas.compat import lrange
12-
from pandas.core.indexes.base import InvalidIndexError
13-
from pandas.util.testing import assert_almost_equal
14-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
15-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
16-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
17-
isna)
12+
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin, iNaT
1813

1914

2015
def test_slice_locs_partial(idx):
@@ -111,7 +106,6 @@ def test_slice_locs_not_contained():
111106
assert result == (0, len(index))
112107

113108

114-
115109
def test_to_series(idx):
116110
# assert that we are creating a copy of the index
117111

‎pandas/tests/indexes/multi/test_integrity.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
import pandas as pd
77
import pandas.util.testing as tm
88
import pytest
9-
from pandas import (CategoricalIndex, DataFrame, DatetimeIndex, Float64Index,
10-
Index, Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
11-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
12-
date_range, isna)
13-
from pandas.compat import long, lrange, range
9+
from pandas import (DataFrame, IntervalIndex, MultiIndex,
10+
RangeIndex, compat, date_range)
11+
from pandas.compat import lrange, range
1412
from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
1513
from pandas.errors import PerformanceWarning, UnsortedIndexError
1614

@@ -409,6 +407,7 @@ def test_unsortedindex_doc_examples():
409407
assert dfm.index.is_lexsorted()
410408
assert dfm.index.lexsort_depth == 2
411409

410+
412411
def test_hash_error(indices):
413412
index = indices
414413
tm.assert_raises_regex(TypeError, "unhashable type: %r" %

‎pandas/tests/indexes/multi/test_join.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_join_level(idx, other, join_type):
3030
if join_type in ('outer', 'inner'):
3131
join_index2, ridx2, lidx2 = \
3232
idx.join(other, how=join_type, level='second',
33-
return_indexers=True)
33+
return_indexers=True)
3434

3535
assert join_index.equals(join_index2)
3636
tm.assert_numpy_array_equal(lidx, lidx2)
@@ -92,4 +92,3 @@ def test_join_self_unique(idx, join_type):
9292
if idx.is_unique:
9393
joined = idx.join(idx, how=join_type)
9494
assert (idx == joined).all()
95-

‎pandas/tests/indexes/multi/test_monotonic.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
# -*- coding: utf-8 -*-
22

3-
import pytest
4-
53
import numpy as np
64
import pandas as pd
7-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
8-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
9-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
10-
isna)
5+
import pytest
6+
from pandas import Index, IntervalIndex, MultiIndex
117

128

139
def test_is_monotonic_increasing():

‎pandas/tests/indexes/multi/test_operations.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
import pandas as pd
88
import pandas.util.testing as tm
99
import pytest
10-
from pandas import (CategoricalIndex, DataFrame, DatetimeIndex, Float64Index,
11-
Index, Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
12-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
13-
date_range, isna, period_range)
14-
from pandas.compat import PYPY, lrange, lzip, range, u
10+
from pandas import (DataFrame, DatetimeIndex, Float64Index, Index, Int64Index,
11+
MultiIndex, PeriodIndex, TimedeltaIndex, UInt64Index,
12+
compat, date_range, period_range)
13+
from pandas.compat import lrange, range, u
1514
from pandas.core.dtypes.dtypes import CategoricalDtype
1615
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
1716
from pandas.util.testing import assert_copy
@@ -480,17 +479,17 @@ def test_multiindex_compare():
480479
# Ensure comparison operations for MultiIndex with nlevels == 1
481480
# behave consistently with those for MultiIndex with nlevels > 1
482481

483-
midx = pd.MultiIndex.from_product([[0, 1]])
482+
midx = pd.MultiIndex.from_product([[0, 1]])
484483

485-
# Equality self-test: MultiIndex object vs self
486-
expected = pd.Series([True, True])
487-
result = pd.Series(midx == midx)
488-
tm.assert_series_equal(result, expected)
484+
# Equality self-test: MultiIndex object vs self
485+
expected = pd.Series([True, True])
486+
result = pd.Series(midx == midx)
487+
tm.assert_series_equal(result, expected)
489488

490-
# Greater than comparison: MultiIndex object vs self
491-
expected = pd.Series([False, False])
492-
result = pd.Series(midx > midx)
493-
tm.assert_series_equal(result, expected)
489+
# Greater than comparison: MultiIndex object vs self
490+
expected = pd.Series([False, False])
491+
result = pd.Series(midx > midx)
492+
tm.assert_series_equal(result, expected)
494493

495494

496495
def test_duplicate_multiindex_labels():
@@ -653,6 +652,7 @@ def f(a):
653652
tm.assert_numpy_array_equal(mi.duplicated(), np.zeros(
654653
len(mi), dtype='bool'))
655654

655+
656656
def test_map(idx):
657657
# callable
658658
index = idx

‎pandas/tests/indexes/multi/test_reindex.py

-1
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,3 @@ def test_reindex_base(idx):
9797

9898
with tm.assert_raises_regex(ValueError, 'Invalid fill method'):
9999
idx.get_indexer(idx, method='invalid')
100-

‎pandas/tests/indexes/multi/test_set_ops.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
2-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
3-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
4-
isna)
1+
# -*- coding: utf-8 -*-
2+
53

6-
import pandas.util.testing as tm
74
import numpy as np
85
import pandas as pd
6+
import pandas.util.testing as tm
7+
from pandas import (CategoricalIndex, DatetimeIndex, MultiIndex, PeriodIndex,
8+
Series, TimedeltaIndex, compat)
99

1010

1111
def test_setops_errorcases(named_index):

‎pandas/tests/indexes/multi/test_sorting.py

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
# -*- coding: utf-8 -*-
22
import numpy as np
3-
import pandas as pd
43
import pandas.util.testing as tm
54
import pytest
6-
from pandas import (CategoricalIndex, DatetimeIndex, Float64Index, Index,
7-
Int64Index, IntervalIndex, MultiIndex, PeriodIndex,
8-
RangeIndex, Series, TimedeltaIndex, UInt64Index, compat,
9-
isna)
10-
from pandas._libs.tslib import iNaT
11-
from pandas.compat import PY3
12-
from pandas.core.indexes.base import InvalidIndexError
13-
from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
5+
from pandas import CategoricalIndex, MultiIndex, RangeIndex
146

157

168
def test_sortlevel(idx):

0 commit comments

Comments
 (0)