Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uniformly weak imports

This commit is contained in:
Aria Desires 2025-12-13 15:11:31 -05:00
parent 961453f75e
commit b4887e77ba
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ty_python_semantic/resources/mdtest/import/conflicts.md
View File

@ -5,7 +5,7 @@
```py ```py
import a.b import a.b
reveal_type(a.b) # revealed: <module 'a.b'> reveal_type(a.b) # revealed: int
``` ```
`a/__init__.py`: `a/__init__.py`:
@ -44,8 +44,8 @@ b: int = 42
import a.b import a.b
from a import b from a import b
reveal_type(b) # revealed: <module 'a.b'> reveal_type(b) # revealed: int
reveal_type(a.b) # revealed: <module 'a.b'> reveal_type(a.b) # revealed: int
``` ```
`a/__init__.py`: `a/__init__.py`:
@ -73,8 +73,8 @@ from a import b
import a.b import a.b
# Python would say `int` for `b` # Python would say `int` for `b`
reveal_type(b) # revealed: <module 'a.b'> reveal_type(b) # revealed: int
reveal_type(a.b) # revealed: <module 'a.b'> reveal_type(a.b) # revealed: int
``` ```
`a/__init__.py`: `a/__init__.py`:

4
crates/ty_python_semantic/resources/mdtest/import/tracking.md
View File

@ -89,8 +89,8 @@ import sub.b
import attr.b import attr.b
# In the Python interpreter, `attr.b` is Literal[1] # In the Python interpreter, `attr.b` is Literal[1]
reveal_type(sub.b) # revealed: <module 'sub.b'> reveal_type(sub.b) # revealed: Literal[1]
reveal_type(attr.b) # revealed: <module 'attr.b'> reveal_type(attr.b) # revealed: Literal[1]
``` ```
`sub/__init__.py`: `sub/__init__.py`:

13
crates/ty_python_semantic/src/types.rs
View File

@ -13301,19 +13301,6 @@ impl<'db> ModuleLiteralType<'db> {
submodule_type = self.resolve_submodule(db, name); submodule_type = self.resolve_submodule(db, name);
} }
// if we're in a module `foo` and `foo` contains `import a.b`,
// and the package `a` has a submodule `b`, we assume that the
// attribute access `a.b` inside `foo` will resolve to the submodule
// `a.b` *even if* `a/__init__.py` also defines a symbol `b` (e.g. `b = 42`).
// This is a heuristic, but it's almost certainly what will actually happen
// at runtime. However, if `foo` only contains `from a.b import <something>,
// we prioritise the `b` attribute in `a/__init__.py` over the submodule `a.b`.
if available_submodule_kind == Some(ImportKind::Import)
&& let Some(submodule) = submodule_type
{
return Place::bound(submodule).into();
}
let place_and_qualifiers = self let place_and_qualifiers = self
.module(db) .module(db)
.file(db) .file(db)