Skip to content

Commit 33bd950

Browse files
committed
Fix side effects
1 parent a6b3962 commit 33bd950

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pandas/core/dtypes/cast.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,10 +1086,7 @@ def convert_dtypes(
10861086
elif (
10871087
infer_objects
10881088
and input_array.dtype == object
1089-
and (
1090-
isinstance(inferred_dtype, str)
1091-
and inferred_dtype == "mixed-integer-float"
1092-
)
1089+
and inferred_dtype == "floating"
10931090
):
10941091
inferred_dtype = pandas_dtype_func("Float64")
10951092

pandas/tests/extension/test_arrow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3090,7 +3090,7 @@ def test_infer_dtype_pyarrow_dtype(data, request):
30903090
res = lib.infer_dtype(data)
30913091
assert res != "unknown-array"
30923092

3093-
if data._hasna and res in ["floating", "datetime64", "timedelta64"]:
3093+
if data._hasna and res in ["datetime64", "timedelta64"]:
30943094
mark = pytest.mark.xfail(
30953095
reason="in infer_dtype pd.NA is not ignored in these cases "
30963096
"even with skipna=True in the list(data) check below"

0 commit comments

Comments
 (0)