-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
STY: Use strict arg in zip() in pandas/core/reshape
#62483
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jsngn
wants to merge
9
commits into
pandas-dev:main
Choose a base branch
from
jsngn:zip-strict
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
095778b
add strict param
jsngn 91d7c0c
Merge branch 'main' into zip-strict
jsngn ee98d3f
Merge branch 'main' into zip-strict
jsngn f85f9c4
Merge branch 'main' into zip-strict
jsngn d10ed5a
Fix tests
jsngn 49b36cd
Merge branch 'main' into zip-strict
jsngn 9950822
Fix tests + pyproject.toml
jsngn e31820d
PR fixes
jsngn 8d1bb70
Merge branch 'main' into zip-strict
jsngn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -185,7 +185,9 @@ def check_len(item, name: str) -> None: | |
| check_len(prefix_sep, "prefix_sep") | ||
|
|
||
| if isinstance(prefix, str): | ||
| prefix = itertools.cycle([prefix]) | ||
| prefix = itertools.islice( | ||
| itertools.cycle([prefix]), data_to_encode.shape[1] | ||
| ) | ||
| if isinstance(prefix, dict): | ||
| prefix = [prefix[col] for col in data_to_encode.columns] | ||
|
|
||
|
|
@@ -194,7 +196,9 @@ def check_len(item, name: str) -> None: | |
|
|
||
| # validate separators | ||
| if isinstance(prefix_sep, str): | ||
| prefix_sep = itertools.cycle([prefix_sep]) | ||
| prefix_sep = itertools.islice( | ||
| itertools.cycle([prefix_sep]), data_to_encode.shape[1] | ||
| ) | ||
|
Comment on lines
+197
to
+199
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here |
||
| elif isinstance(prefix_sep, dict): | ||
| prefix_sep = [prefix_sep[col] for col in data_to_encode.columns] | ||
|
|
||
|
|
@@ -211,7 +215,9 @@ def check_len(item, name: str) -> None: | |
| # columns to prepend to result. | ||
| with_dummies = [data.select_dtypes(exclude=dtypes_to_encode)] | ||
|
|
||
| for col, pre, sep in zip(data_to_encode.items(), prefix, prefix_sep): | ||
| for col, pre, sep in zip( | ||
| data_to_encode.items(), prefix, prefix_sep, strict=True | ||
| ): | ||
| # col is (column_name, column), use just column data here | ||
| dummy = _get_dummies_1d( | ||
| col[1], | ||
|
|
@@ -325,15 +331,15 @@ def get_empty_frame(data) -> DataFrame: | |
| codes = codes[mask] | ||
| n_idx = np.arange(N)[mask] | ||
|
|
||
| for ndx, code in zip(n_idx, codes): | ||
| for ndx, code in zip(n_idx, codes, strict=True): | ||
| sp_indices[code].append(ndx) | ||
|
|
||
| if drop_first: | ||
| # remove first categorical level to avoid perfect collinearity | ||
| # GH12042 | ||
| sp_indices = sp_indices[1:] | ||
| dummy_cols = dummy_cols[1:] | ||
| for col, ixs in zip(dummy_cols, sp_indices): | ||
| for col, ixs in zip(dummy_cols, sp_indices, strict=True): | ||
| sarr = SparseArray( | ||
| np.ones(len(ixs), dtype=dtype), | ||
| sparse_index=IntIndex(N, ixs), | ||
|
|
@@ -538,7 +544,11 @@ def from_dummies( | |
| raise ValueError(len_msg) | ||
| elif isinstance(default_category, Hashable): | ||
| default_category = dict( | ||
| zip(variables_slice, [default_category] * len(variables_slice)) | ||
| zip( | ||
| variables_slice, | ||
| [default_category] * len(variables_slice), | ||
| strict=True, | ||
| ) | ||
| ) | ||
| else: | ||
| raise TypeError( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -696,7 +696,9 @@ def stack_factorize(index): | |
| levels=new_levels, codes=new_codes, names=new_names, verify_integrity=False | ||
| ) | ||
| else: | ||
| levels, (ilab, clab) = zip(*map(stack_factorize, (frame.index, frame.columns))) | ||
| levels, (ilab, clab) = zip( | ||
| *map(stack_factorize, (frame.index, frame.columns)), strict=True | ||
| ) | ||
| codes = ilab.repeat(K), np.tile(clab, N).ravel() | ||
| new_index = MultiIndex( | ||
| levels=levels, | ||
|
|
@@ -778,21 +780,21 @@ def _stack_multi_column_index(columns: MultiIndex) -> MultiIndex | Index: | |
|
|
||
| levs = ( | ||
| [lev[c] if c >= 0 else None for c in codes] | ||
| for lev, codes in zip(columns.levels[:-1], columns.codes[:-1]) | ||
| for lev, codes in zip(columns.levels[:-1], columns.codes[:-1], strict=True) | ||
| ) | ||
|
|
||
| # Remove duplicate tuples in the MultiIndex. | ||
| tuples = zip(*levs) | ||
| tuples = zip(*levs, strict=True) | ||
| unique_tuples = (key for key, _ in itertools.groupby(tuples)) | ||
| new_levs = zip(*unique_tuples) | ||
| new_levs = zip(*unique_tuples, strict=True) | ||
|
|
||
| # The dtype of each level must be explicitly set to avoid inferring the wrong type. | ||
| # See GH-36991. | ||
| return MultiIndex.from_arrays( | ||
| [ | ||
| # Not all indices can accept None values. | ||
| Index(new_lev, dtype=lev.dtype) if None not in new_lev else new_lev | ||
| for new_lev, lev in zip(new_levs, columns.levels) | ||
| for new_lev, lev in zip(new_levs, columns.levels, strict=False) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just to confirm: was there a failing test because this was True? |
||
| ], | ||
| names=columns.names[:-1], | ||
| ) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice Idea! But I think that
itertools.repeatshould be preferred.