Skip to content

Commit f2041a0

Browse files
committed
Revert changes in common and test query
1 parent 052b040 commit f2041a0

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

pandas/core/dtypes/common.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,7 @@ def is_object_dtype(arr_or_dtype) -> bool:
179179
>>> is_object_dtype([1, 2, 3])
180180
False
181181
"""
182-
from pandas.core.arrays.string_ import StringDtype
183-
184-
return (
185-
isinstance(arr_or_dtype, np.dtype)
186-
and arr_or_dtype == "object"
187-
or isinstance(arr_or_dtype, StringDtype)
188-
)
182+
return _is_dtype_type(arr_or_dtype, classes(np.object_))
189183

190184

191185
def is_sparse(arr) -> bool:

pandas/tests/frame/test_query_eval.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,11 @@ def test_query_empty_string(self):
160160
df.query("")
161161

162162
def test_query_duplicate_column_name(self, engine, parser):
163-
df = DataFrame(
164-
{
165-
"A": range(3),
166-
"B": range(3),
167-
"C": range(3)
168-
}
169-
).rename(columns={"B": "A"})
163+
df = DataFrame({"A": range(3), "B": range(3), "C": range(3)}).rename(
164+
columns={"B": "A"}
165+
)
170166

171-
res = df.query('C == 1', engine=engine, parser=parser)
167+
res = df.query("C == 1", engine=engine, parser=parser)
172168

173169
expect = DataFrame([[1, 1, 1]], columns=["A", "A", "C"], index=[1])
174170

0 commit comments

Comments
 (0)