Skip to content

Commit 66d8a1d

Browse files
committed
Brock feedback
1 parent c55bc0a commit 66d8a1d

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

pandas/core/internals/blocks.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -576,10 +576,7 @@ def convert_dtypes(
576576
@final
577577
@cache_readonly
578578
def dtype(self) -> DtypeObj:
579-
try:
580-
return self.values.dtype
581-
except AttributeError: # PyArrow fallback
582-
return self.values.type
579+
return self.values.dtype
583580

584581
@final
585582
def astype(
@@ -2237,16 +2234,12 @@ def new_block(
22372234
*,
22382235
ndim: int,
22392236
refs: BlockValuesRefs | None = None,
2240-
dtype: DtypeObj | None,
22412237
) -> Block:
22422238
# caller is responsible for ensuring:
22432239
# - values is NOT a NumpyExtensionArray
22442240
# - check_ndim/ensure_block_shape already checked
22452241
# - maybe_coerce_values already called/unnecessary
2246-
if dtype:
2247-
klass = get_block_type(dtype)
2248-
else:
2249-
klass = get_block_type(values.dtype)
2242+
klass = get_block_type(values.dtype)
22502243
return klass(values, ndim=ndim, placement=placement, refs=refs)
22512244

22522245

pandas/core/internals/managers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1978,7 +1978,6 @@ def from_blocks(
19781978
def from_array(
19791979
cls,
19801980
array: ArrayLike,
1981-
dtype: DtypeObj | None,
19821981
index: Index,
19831982
refs: BlockValuesRefs | None = None,
19841983
) -> SingleBlockManager:
@@ -1987,7 +1986,7 @@ def from_array(
19871986
"""
19881987
array = maybe_coerce_values(array)
19891988
bp = BlockPlacement(slice(0, len(index)))
1990-
block = new_block(array, placement=bp, ndim=1, refs=refs, dtype=dtype)
1989+
block = new_block(array, placement=bp, ndim=1, refs=refs)
19911990
return cls(block, index)
19921991

19931992
def to_2d_mgr(self, columns: Index) -> BlockManager:

pandas/core/series.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ def __init__(
505505
data = data.copy()
506506
else:
507507
data = sanitize_array(data, index, dtype, copy)
508-
data = SingleBlockManager.from_array(data, dtype, index, refs=refs)
508+
data = SingleBlockManager.from_array(data, index, refs=refs)
509509

510510
NDFrame.__init__(self, data)
511511
self.name = name

pandas/io/formats/format.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,11 +1103,7 @@ def format_array(
11031103
List[str]
11041104
"""
11051105
fmt_klass: type[_GenericArrayFormatter]
1106-
if hasattr(values, "type") and values.type == "null":
1107-
fmt_klass = _NullFormatter
1108-
if hasattr(values, "type") and str(values.type).startswith("list"):
1109-
fmt_klass = _ListFormatter
1110-
elif lib.is_np_dtype(values.dtype, "M"):
1106+
if lib.is_np_dtype(values.dtype, "M"):
11111107
fmt_klass = _Datetime64Formatter
11121108
values = cast(DatetimeArray, values)
11131109
elif isinstance(values.dtype, DatetimeTZDtype):

0 commit comments

Comments
 (0)