Support modules with different casing in build backend #12240
+161
−13
Conversation
This file contains 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
Match the module name to its module directory with potentially different casing. For example, a package may have the dist-info-normalized package name `pil_util`, but the importable module is named `PIL_util`. We get the module either as dist-info-normalized package name, or explicitly from the user. For dist-info-normalizing a package name, the rules are lowercasing, replacing `.` with `_` and replace `-` with `_`. Since `.` and `-` are not allowed in module names, we can check whether a directory name matches our expected module name by lowercasing it. Fixes #12187
| let normalized = module_name.to_string(); | ||
| let modules = fs_err::read_dir(src_root)? | ||
| .filter_ok(|entry| { | ||
| entry.file_name().to_string_lossy().to_lowercase() == normalized |
There was a problem hiding this comment.
You can probably use to_str here since if it's not Unicode it would never match, right?
| [] => Err(Error::MissingModule { | ||
| module_name, | ||
| project_src: src_root.to_path_buf(), | ||
| }), |
There was a problem hiding this comment.
I would suggest adding an error for the case in which a matching directory exists, but there's no __init__.py file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Match the module name to its module directory with potentially different casing.
For example, a package may have the dist-info-normalized package name
pil_util, but the importable module is namedPIL_util.We get the module name either as dist-info-normalized package name, or explicitly from the user. For dist-info-normalizing a package name, the rules are lowercasing, replacing
.with_and replace-with_. Since.and-are not allowed in module names, we can check whether a directory name matches our expected module name by lowercasing it.Fixes #12187