Skip to content

fix: allow ATLAS-style file names for ROOT files #1472

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
merged 9 commits into from
Jul 29, 2025
Merged

fix: allow ATLAS-style file names for ROOT files #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8a1f28
Allowing ATLAS-style file names for ROOT files
Jul 21, 2025
0d4a4f0
style: pre-commit fixes
pre-commit-ci[bot] Jul 21, 2025
3d85769
Removing file extension requirements altogether following discussions
Jul 22, 2025
c97e5ca
Update src/uproot/_util.py
zlmarshall Jul 22, 2025
362930a
Merge branch 'main' into atlas_file_match_pattern
ariostas Jul 23, 2025
6398076
Removing formerly invalid file that is now valid from tests
Jul 24, 2025
7831bce
Changed regex
ariostas Jul 25, 2025
cb49995
Merge branch 'main' into atlas_file_match_pattern
ariostas Jul 25, 2025
2f00393
Added validity test
ariostas Jul 28, 2025
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
4 changes: 2 additions & 2 deletions src/uproot/_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,11 @@ def file_object_path_split(urlpath: str) -> tuple[str, str | None]:

separator = "::"
parts = urlpath.split(separator)
object_regex = re.compile(r"(.+\.root):(.*$)", re.IGNORECASE)
object_regex = re.compile(r"(.+\.root(\.[0-9]+)?):(.*$)", re.IGNORECASE)
for i, part in enumerate(reversed(parts)):
match = object_regex.match(part)
if match:
obj = re.sub(r"/+", "/", match.group(2).strip().lstrip("/")).rstrip("/")
obj = re.sub(r"/+", "/", match.group(3).strip().lstrip("/")).rstrip("/")
parts[-i - 1] = match.group(1)
break

Expand Down
8 changes: 7 additions & 1 deletion tests/test_0976_path_object_split.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@
"Dir/Test",
),
),
(
"http://xcacheserver:8762//https://originserver:4212/path/file.root.1:CollectionTree",
(
"http://xcacheserver:8762//https://originserver:4212/path/file.root.1",
"CollectionTree",
),
),
],
)
def test_url_split(input_value, expected_output):
Expand Down Expand Up @@ -202,7 +209,6 @@ def test_url_no_split(input_value):
"local/file.root.zip://Events",
"local/file.roo://Events",
"local/file://Events",
"http://xcacheserver:8762//https://originserver:4212/path/file.root.1:CollectionTree",
],
)
def test_url_split_invalid(input_value):
Expand Down
Loading