Commit 23926b5

anthonyspeicherAnthony Speicher

and

Anthony Speicher

authored

Zip Strict specification for pandas/core/internals (#62453)

Co-authored-by: Anthony Speicher <anthony@speicher.org>

1 parent 179258f commit 23926b5Copy full SHA for 23926b5

File tree

4 files changed

+13

-12

lines changed

pandas/core/internals
pyproject.toml

4 files changed

+13

-12

lines changed

`‎pandas/core/internals/blocks.py‎`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ def convert_dtypes(`
`564`	`564`	`rbs.append(blk.copy(deep=False))`
`565`	`565`	`continue`
`566`	`566`
`567`		`- for dtype, b in zip(dtypes, sub_blks):`
	`567`	`+ for dtype, b in zip(dtypes, sub_blks, strict=True):`
`568`	`568`	`rbs.append(b.astype(dtype=dtype, squeeze=b.ndim != 1))`
`569`	`569`	`return rbs`
`570`	`570`
`@@ -803,7 +803,7 @@ def replace_list(`
`803`	`803`	`# Exclude anything that we know we won't contain`
`804`	`804`	`pairs = [`
`805`	`805`	`(x, y)`
`806`		`- for x, y in zip(src_list, dest_list)`
	`806`	`+ for x, y in zip(src_list, dest_list, strict=True)`
`807`	`807`	`if (self._can_hold_element(x) or (self.dtype == "string" and is_re(x)))`
`808`	`808`	`]`
`809`	`809`	`if not pairs:`
`@@ -833,7 +833,7 @@ def replace_list(`
`833`	`833`	`# references when we check again later`
`834`	`834`	`rb = [self]`
`835`	`835`
`836`		`- for i, ((src, dest), mask) in enumerate(zip(pairs, masks)):`
	`836`	`+ for i, ((src, dest), mask) in enumerate(zip(pairs, masks, strict=True)):`
`837`	`837`	`new_rb: list[Block] = []`
`838`	`838`
`839`	`839`	`# GH-39338: _replace_coerce can split a block into`
`@@ -2117,7 +2117,9 @@ def _unstack(`
`2117`	`2117`	`BlockPlacement(place),`
`2118`	`2118`	`ndim=2,`
`2119`	`2119`	`)`
`2120`		`- for i, (indices, place) in enumerate(zip(new_values, new_placement))`
	`2120`	`+ for i, (indices, place) in enumerate(`
	`2121`	`+ zip(new_values, new_placement, strict=True)`
	`2122`	`+ )`
`2121`	`2123`	`]`
`2122`	`2124`	`return blocks, mask`
`2123`	`2125`

`‎pandas/core/internals/construction.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ def ndarray_to_mgr(`
`302`	`302`	`for x in obj_columns`
`303`	`303`	`]`
`304`	`304`	`# don't convert (and copy) the objects if no type inference occurs`
`305`		`- if any(x is not y for x, y in zip(obj_columns, maybe_datetime)):`
	`305`	`+ if any(x is not y for x, y in zip(obj_columns, maybe_datetime, strict=True)):`
`306`	`306`	`block_values = [`
`307`	`307`	`new_block_2d(ensure_block_shape(dval, 2), placement=BlockPlacement(n))`
`308`	`308`	`for n, dval in enumerate(maybe_datetime)`

`‎pandas/core/internals/managers.py‎`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,9 @@ def equals(self, other: object) -> bool:`
`385`	`385`	`self_axes, other_axes = self.axes, other.axes`
`386`	`386`	`if len(self_axes) != len(other_axes):`
`387`	`387`	`return False`
`388`		`- if not all(ax1.equals(ax2) for ax1, ax2 in zip(self_axes, other_axes)):`
	`388`	`+ if not all(`
	`389`	`+ ax1.equals(ax2) for ax1, ax2 in zip(self_axes, other_axes, strict=True)`
	`390`	`+ ):`
`389`	`391`	`return False`
`390`	`392`
`391`	`393`	`return self._equal_values(other)`
`@@ -989,7 +991,7 @@ def _slice_take_blocks_ax0(`
`989`	`991`	`elif only_slice:`
`990`	`992`	`# GH#33597 slice instead of take, so we get`
`991`	`993`	`# views instead of copies`
`992`		`- for i, ml in zip(taker, mgr_locs):`
	`994`	`+ for i, ml in zip(taker, mgr_locs, strict=True):`
`993`	`995`	`slc = slice(i, i + 1)`
`994`	`996`	`bp = BlockPlacement(ml)`
`995`	`997`	`nb = blk.getitem_block_columns(slc, new_mgr_locs=bp)`
`@@ -2411,12 +2413,12 @@ def _tuples_to_blocks_no_consolidate(tuples, refs) -> list[Block]:`
`2411`	`2413`	`new_block_2d(`
`2412`	`2414`	`ensure_block_shape(arr, ndim=2), placement=BlockPlacement(i), refs=ref`
`2413`	`2415`	`)`
`2414`		`- for ((i, arr), ref) in zip(tuples, refs)`
	`2416`	`+ for ((i, arr), ref) in zip(tuples, refs, strict=True)`
`2415`	`2417`	`]`
`2416`	`2418`
`2417`	`2419`
`2418`	`2420`	`def _stack_arrays(tuples, dtype: np.dtype):`
`2419`		`- placement, arrays = zip(*tuples)`
	`2421`	`+ placement, arrays = zip(*tuples, strict=True)`
`2420`	`2422`
`2421`	`2423`	`first = arrays[0]`
`2422`	`2424`	`shape = (len(arrays),) + first.shape`

`‎pyproject.toml‎`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -465,9 +465,6 @@ exclude = [`
`465`	`465`	`"pandas/core/indexes/interval.py" = ["B905"]`
`466`	`466`	`"pandas/core/indexes/multi.py" = ["B905"]`
`467`	`467`	`"pandas/core/indexing.py" = ["B905"]`
`468`		`-"pandas/core/internals/blocks.py" = ["B905"]`
`469`		`-"pandas/core/internals/construction.py" = ["B905"]`
`470`		`-"pandas/core/internals/managers.py" = ["B905"]`
`471`	`468`	`"pandas/core/methods/to_dict.py" = ["B905"]`
`472`	`469`	`"pandas/core/reshape/concat.py" = ["B905"]`
`473`	`470`	`"pandas/core/reshape/encoding.py" = ["B905"]`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 23926b5

File tree

4 files changed

4 files changed

`‎pandas/core/internals/blocks.py‎`

`‎pandas/core/internals/construction.py‎`

`‎pandas/core/internals/managers.py‎`

`‎pyproject.toml‎`

0 commit comments