Skip to content

Commit 935b475

Browse files
committed
fix: #1304 PD_LTE_23 #1304 (comment)
1 parent 9a389ec commit 935b475

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

tests/series/arithmetic/test_truediv.py

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
import pandas as pd
66
from typing_extensions import assert_type
77

8-
from tests import check
8+
from tests import (
9+
PD_LTE_23,
10+
check,
11+
)
912

1013
left = pd.DataFrame({"a": [1, 2, 3]})["a"] # left operand
1114

@@ -140,12 +143,24 @@ def test_truediv_pd_series() -> None:
140143
check(assert_type(left.rdiv(c), pd.Series), pd.Series)
141144

142145

146+
def test_path_div() -> None:
147+
# GH 682
148+
folder = Path.cwd()
149+
150+
folders = pd.Series([folder, folder])
151+
check(assert_type(folders / Path("a.png"), pd.Series), pd.Series, Path)
152+
153+
143154
def test_truediv_path() -> None:
144-
"""Test pd.Series / path object"""
145-
left, p = pd.Series(["pat", "ath", "path"]), Path()
155+
"""Test pd.Series / path object.
156+
157+
Also GH 682."""
158+
left, p = pd.Series(["a.png", "b.gz", "c.txt"]), Path.cwd()
146159

147160
check(assert_type(left / p, pd.Series), pd.Series, Path)
148-
check(assert_type(p / left, pd.Series), pd.Series, Path)
161+
if PD_LTE_23:
162+
# Bug in 3.0 https://github.com/pandas-dev/pandas/issues/61940
163+
check(assert_type(p / left, pd.Series), pd.Series, Path)
149164

150165
check(assert_type(left.truediv(p), pd.Series), pd.Series, Path)
151166
check(assert_type(left.div(p), pd.Series), pd.Series, Path)

tests/series/test_series.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3802,18 +3802,6 @@ def test_series_bool_fails() -> None:
38023802
pass
38033803

38043804

3805-
def test_path_div() -> None:
3806-
# GH 682
3807-
folder = Path.cwd()
3808-
files = pd.Series(["a.png", "b.png"])
3809-
if PD_LTE_23:
3810-
# Bug in 3.0 https://github.com/pandas-dev/pandas/issues/61940
3811-
check(assert_type(folder / files, pd.Series), pd.Series, Path)
3812-
3813-
folders = pd.Series([folder, folder])
3814-
check(assert_type(folders / Path("a.png"), pd.Series), pd.Series, Path)
3815-
3816-
38173805
def test_series_dict() -> None:
38183806
# GH 812
38193807
check(

0 commit comments

Comments
 (0)