mirror of
https://github.com/astral-sh/ruff
synced 2026-01-07 22:54:28 -05:00
Config error only when flake8-import-conventions alias conflicts with isort.required-imports bound name (#15918)
Previously an error was emitted any time the configuration required both
an import of a module and an alias for that module. However, required
imports could themselves contain an alias, which may or may not agree
with the required alias.
To wit: requiring `import pandas as pd` does not conflict with the
`flake8-import-conventions.alias` config `{"pandas":"pd"}`.
This PR refines the check before throwing an error.
Closes #15911
This commit is contained in:
@@ -43,7 +43,7 @@ impl NameImports {
|
||||
|
||||
impl NameImport {
|
||||
/// Returns the name under which the member is bound (e.g., given `from foo import bar as baz`, returns `baz`).
|
||||
fn bound_name(&self) -> &str {
|
||||
pub fn bound_name(&self) -> &str {
|
||||
match self {
|
||||
NameImport::Import(import) => {
|
||||
import.name.as_name.as_deref().unwrap_or(&import.name.name)
|
||||
|
||||
Reference in New Issue
Block a user