Skip to content

Commit e31820d

Browse files
committed
PR fixes
1 parent 9950822 commit e31820d

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

pandas/core/reshape/encoding.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ def check_len(item, name: str) -> None:
183183
check_len(prefix_sep, "prefix_sep")
184184

185185
if isinstance(prefix, str):
186-
prefix = itertools.cycle([prefix])
186+
prefix = itertools.islice(
187+
itertools.cycle([prefix]), data_to_encode.shape[1]
188+
)
187189
if isinstance(prefix, dict):
188190
prefix = [prefix[col] for col in data_to_encode.columns]
189191

@@ -192,7 +194,9 @@ def check_len(item, name: str) -> None:
192194

193195
# validate separators
194196
if isinstance(prefix_sep, str):
195-
prefix_sep = itertools.cycle([prefix_sep])
197+
prefix_sep = itertools.islice(
198+
itertools.cycle([prefix_sep]), data_to_encode.shape[1]
199+
)
196200
elif isinstance(prefix_sep, dict):
197201
prefix_sep = [prefix_sep[col] for col in data_to_encode.columns]
198202

@@ -210,7 +214,7 @@ def check_len(item, name: str) -> None:
210214
with_dummies = [data.select_dtypes(exclude=dtypes_to_encode)]
211215

212216
for col, pre, sep in zip(
213-
data_to_encode.items(), prefix, prefix_sep, strict=False
217+
data_to_encode.items(), prefix, prefix_sep, strict=True
214218
):
215219
# col is (column_name, column), use just column data here
216220
dummy = _get_dummies_1d(

pandas/core/reshape/reshape.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ def _stack_multi_column_index(columns: MultiIndex) -> MultiIndex | Index:
780780

781781
levs = (
782782
[lev[c] if c >= 0 else None for c in codes]
783-
for lev, codes in zip(columns.levels[:-1], columns.codes[:-1], strict=False)
783+
for lev, codes in zip(columns.levels[:-1], columns.codes[:-1], strict=True)
784784
)
785785

786786
# Remove duplicate tuples in the MultiIndex.

0 commit comments

Comments
 (0)