Skip to content

Commit 414430c

Browse files
authored
isort mypy import confilict (#35380)
1 parent bb2ff33 commit 414430c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pandas/tests/reshape/merge/test_join.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from numpy.random import randn
33
import pytest
44

5-
from pandas._libs import join as libjoin
5+
from pandas._libs.join import inner_join, left_outer_join
66

77
import pandas as pd
88
from pandas import DataFrame, Index, MultiIndex, Series, concat, merge
@@ -48,7 +48,7 @@ def test_cython_left_outer_join(self):
4848
right = a_([1, 1, 0, 4, 2, 2, 1], dtype=np.int64)
4949
max_group = 5
5050

51-
ls, rs = libjoin.left_outer_join(left, right, max_group)
51+
ls, rs = left_outer_join(left, right, max_group)
5252

5353
exp_ls = left.argsort(kind="mergesort")
5454
exp_rs = right.argsort(kind="mergesort")
@@ -70,7 +70,7 @@ def test_cython_right_outer_join(self):
7070
right = a_([1, 1, 0, 4, 2, 2, 1], dtype=np.int64)
7171
max_group = 5
7272

73-
rs, ls = libjoin.left_outer_join(right, left, max_group)
73+
rs, ls = left_outer_join(right, left, max_group)
7474

7575
exp_ls = left.argsort(kind="mergesort")
7676
exp_rs = right.argsort(kind="mergesort")
@@ -116,7 +116,7 @@ def test_cython_inner_join(self):
116116
right = a_([1, 1, 0, 4, 2, 2, 1, 4], dtype=np.int64)
117117
max_group = 5
118118

119-
ls, rs = libjoin.inner_join(left, right, max_group)
119+
ls, rs = inner_join(left, right, max_group)
120120

121121
exp_ls = left.argsort(kind="mergesort")
122122
exp_rs = right.argsort(kind="mergesort")

0 commit comments

Comments
 (0)