Fixed a bug in the special-case logic that handles __all__.extend(<submodule>.__all__) so it better handles the case where <module> is imported using an import statement of the form from x import submodule.

msfterictraut · msfterictraut · commit 2ded6eaa54fc · 2022-08-16T15:54:14.000-07:00
diff --git a/packages/pyright-internal/src/analyzer/binder.ts b/packages/pyright-internal/src/analyzer/binder.ts
@@ -2407,12 +2407,17 @@ export class Binder extends ParseTreeWalker {
             return undefined;
         }
 
-        const lookupInfo = this._fileInfo.importLookup(resolvedPath);
-        if (!lookupInfo) {
-            return undefined;
+        let lookupInfo = this._fileInfo.importLookup(resolvedPath);
+        if (lookupInfo?.dunderAllNames) {
+            return lookupInfo.dunderAllNames;
+        }
+
+        if (aliasDecl?.submoduleFallback?.path) {
+            lookupInfo = this._fileInfo.importLookup(aliasDecl.submoduleFallback.path);
+            return lookupInfo?.dunderAllNames;
         }
 
-        return lookupInfo.dunderAllNames;
+        return undefined;
     }
 
     private _addImplicitFromImport(node: ImportFromNode, importInfo?: ImportResult) {

Original file line number	Diff line number	Diff line change
`@@ -2407,12 +2407,17 @@ export class Binder extends ParseTreeWalker {`
`2407`	`2407`	`return undefined;`
`2408`	`2408`	`}`
`2409`	`2409`
`2410`		`- const lookupInfo = this._fileInfo.importLookup(resolvedPath);`
`2411`		`- if (!lookupInfo) {`
`2412`		`- return undefined;`
	`2410`	`+ let lookupInfo = this._fileInfo.importLookup(resolvedPath);`
	`2411`	`+ if (lookupInfo?.dunderAllNames) {`
	`2412`	`+ return lookupInfo.dunderAllNames;`
	`2413`	`+ }`
	`2414`	`+`
	`2415`	`+ if (aliasDecl?.submoduleFallback?.path) {`
	`2416`	`+ lookupInfo = this._fileInfo.importLookup(aliasDecl.submoduleFallback.path);`
	`2417`	`+ return lookupInfo?.dunderAllNames;`
`2413`	`2418`	`}`
`2414`	`2419`
`2415`		`- return lookupInfo.dunderAllNames;`
	`2420`	`+ return undefined;`
`2416`	`2421`	`}`
`2417`	`2422`
`2418`	`2423`	`private _addImplicitFromImport(node: ImportFromNode, importInfo?: ImportResult) {`