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

reapply fix

This commit is contained in:
Aria Desires 2025-11-26 19:30:39 -05:00
parent eeadf2a556
commit 2e4bf8f453
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/ty_python_semantic/resources/mdtest/import/nonstandard_conventions.md
View File

@ -919,8 +919,7 @@ from typing import TYPE_CHECKING
from mypackage.conflicted.other1 import x as x1 from mypackage.conflicted.other1 import x as x1
import mypackage.conflicted.b.c import mypackage.conflicted.b.c
# error: [possibly-missing-attribute] reveal_type(mypackage.conflicted.b.c.y) # revealed: int
reveal_type(mypackage.conflicted.b.c.y) # revealed: Unknown
``` ```
## Re-export Nameclash Problems In Functions ## Re-export Nameclash Problems In Functions

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

@ -13317,8 +13317,7 @@ impl<'db> ModuleLiteralType<'db> {
let place_and_qualifiers = self let place_and_qualifiers = self
.module(db) .module(db)
.file(db) .file(db)
.map(|file| imported_symbol(db, file, name, None)) .map(|file| {
/*.map(|file| {
imported_symbol(db, file, name, None).map_type(|ty| { imported_symbol(db, file, name, None).map_type(|ty| {
if let Some(importing) = self.importing_file(db) if let Some(importing) = self.importing_file(db)
&& let Type::ModuleLiteral(module) = ty && let Type::ModuleLiteral(module) = ty
@ -13328,7 +13327,7 @@ impl<'db> ModuleLiteralType<'db> {
ty ty
} }
}) })
})*/ })
.unwrap_or_default(); .unwrap_or_default();
if !place_and_qualifiers.is_undefined() { if !place_and_qualifiers.is_undefined() {