Visitar URL original
Harden path-handling after pathlib migration by deruyter92 · Pull Request #3421 · DeepLabCut/DeepLabCut · GitHub
Skip to content

Harden path-handling after pathlib migration #3421

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.

Sign up for GitHub

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

Merged
deruyter92 merged 9 commits into from
Jul 21, 2026
Merged

Harden path-handling after pathlib migration #3421

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6859773
pathlib mkdir hardening + remaining str concat fixes
deruyter92 Jul 20, 2026
7667748
hardening of path-normalization in `guarantee_multiindex_rows`
deruyter92 Jul 20, 2026
77b9e1f
remove str-required `robust_path_split` (redundant with pathlib Path)
deruyter92 Jul 20, 2026
a272894
deprecate `str`-based `grab_files_in_folder` and migrate callers to p…
deruyter92 Jul 20, 2026
0a9bbbc
fix test_auxiliary functions wrong type: tmpdir.LocalPath -> str or Path
deruyter92 Jul 20, 2026
d050c04
fix numpy to list conversion in .mat image list.
deruyter92 Jul 21, 2026
5daaade
Ensure TF branch normalizes to str ( excluded from pathlib migration)
deruyter92 Jul 21, 2026
849644a
auxfun_multianimal migrate to Path in Load and Save MA data
deruyter92 Jul 21, 2026
a1eaaae
fix pad with spaces in normalize numpy file paths
deruyter92 Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
hardening of path-normalization in guarantee_multiindex_rows 
The old code checks only the first row (df.index[0]) to decide whether to split on / or \, then applies that one separator to the entire DataFrame.

The new approach normalizes all backslashes to forward slashes first, then splits. So mixed-separator DataFrames (e.g. cross platform merges) work correctly.
  • Loading branch information
@deruyter92
deruyter92 committed Jul 21, 2026
commit 7667748fea88edfb4ae1c8a4a6ba8a8070d55111
6 changes: 2 additions & 4 deletions deeplabcut/utils/conversioncode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,11 +343,9 @@ def merge_windowsannotationdataONlinuxsystem(cfg):
def guarantee_multiindex_rows(df):
# Make paths platform-agnostic if they are not already
if not isinstance(df.index, pd.MultiIndex): # Backwards compatibility
path = df.index[0]
try:
sep = "/" if "/" in path else "\\"
splits = tuple(df.index.str.split(sep))
df.index = pd.MultiIndex.from_tuples(splits)
splits = df.index.str.replace("\\", "/").str.split("/")
df.index = pd.MultiIndex.from_tuples([tuple(s) for s in splits])
except TypeError: # Ignore numerical index of frame indices
pass

Expand Down