Use updated, more permissive, regex for file and directory names#371
Merged
gkreitz merged 1 commit intoKattis:masterfrom Nov 28, 2025
Merged
Use updated, more permissive, regex for file and directory names#371gkreitz merged 1 commit intoKattis:masterfrom
gkreitz merged 1 commit intoKattis:masterfrom
Conversation
pehrsoderman
approved these changes
Nov 28, 2025
| def _check_file_and_directory_names(self): | ||
| filename_regex = re.compile(r'^[a-z0-9][a-z0-9_.-]{0,253}[a-z0-9]$', re.I) | ||
| directory_regex = re.compile(r'^[a-z0-9]([a-z0-9_-]{0,253}[a-z0-9])?$', re.I) | ||
| regex = re.compile(r'^[a-zA-Z0-9_][a-zA-Z0-9_.-]{0,254}$') |
Contributor
There was a problem hiding this comment.
While I understand the logic, we might want a somewhat more descriptive variable name ;)
Contributor
Author
There was a problem hiding this comment.
I think it's fine. It's a local variable in a function called "_check_file_and_directory_names".
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Kattis/problem-package-format#453 has now been resolved, and the regex for file and directory names in the new standard is more permissive.
This PR adopts the new regex for both legacy and the new standard, as I see no reason not to fix this also for legacy. This PR also treats directory names not matching the regex as an error in legacy (it is currently only a warning in legacy). I've added a PR to the standard to make these changes to the standard doc, Kattis/problem-package-format#526 .
This PR also removes an old regex for when searching for permissions, which predates the more general requirements on all file names in a package. Sorry to those who named their C++ files as
.c++, that's no longer allowed. :)