Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pyrefly/lib/binding/scope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1879,9 +1879,15 @@ impl Scopes {
// is a special export.
let value = self.get_flow_info(base_name)?.value()?;
match &value.style {
FlowStyle::MergeableImport(m) | FlowStyle::ImportAs(m) => {
lookup.is_special_export(*m, name)
FlowStyle::MergeableImport(m) => {
// For dotted imports like `import collections.abc`, the base module `collections`
// is also implicitly imported, so we should check that too.
let base_module = ModuleName::from_name(base_name);
lookup
.is_special_export(*m, name)
.or_else(|| lookup.is_special_export(base_module, name))
}
FlowStyle::ImportAs(m) => lookup.is_special_export(*m, name),
FlowStyle::Import(m, upstream_name) => lookup.is_special_export(*m, upstream_name),
_ => None,
}
Expand Down
25 changes: 25 additions & 0 deletions pyrefly/lib/test/named_tuple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -598,3 +598,28 @@ class QConfig(namedtuple("QConfig", ["activation", "weight"])):
return super().__new__(cls, activation, weight)
"#,
);

// Regression test for https://github.com/facebook/pyrefly/issues/2622
// `import collections.abc` should not break special handling of `collections.namedtuple`.
testcase!(
test_named_tuple_collections_submodule_import,
r#"
import collections
import collections.abc

Point = collections.namedtuple("Point", ["x", "y"])
p = Point(x=1, y=2)
"#,
);

// `import collections.abc` alone (without explicit `import collections`) should still
// allow `collections.namedtuple` to work, since `import X.Y` implicitly imports `X`.
testcase!(
test_named_tuple_collections_submodule_import_only,
r#"
import collections.abc

Point = collections.namedtuple("Point", ["x", "y"])
p = Point(x=1, y=2)
"#,
);