#173: Added type checker knowledge of the built-in type "ModuleType" …

…so imported modules are assignable to this type.
microsoft · Jul 19, 2019 · 1ca24e0 · 1ca24e0
1 parent 051e32c
commit 1ca24e0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/server/src/analyzer/sourceFile.ts b/server/src/analyzer/sourceFile.ts
@@ -161,6 +161,7 @@ export class SourceFile {
         this._isBuiltInStubFile = false;
         if (this._isStubFile) {
             if (this._filePath.endsWith('/collections/__init__.pyi') ||
+                    fileName === '_importlib_modulespec.pyi' ||
                     fileName === 'dataclasses.pyi' ||
                     fileName === 'abc.pyi' ||
                     fileName === 'enum.pyi') {

diff --git a/server/src/analyzer/typeUtils.ts b/server/src/analyzer/typeUtils.ts
@@ -420,6 +420,11 @@ export class TypeUtils {
                     }
                     return true;
                 }
+            } else if (srcType instanceof ModuleType) {
+                // Is the destination the built-in "ModuleType"?
+                if (destClassType.isBuiltIn() && destClassType.getClassName() === 'ModuleType') {
+                    return true;
+                }
             }
         }
 

diff --git a/server/src/tests/samples/module2.py b/server/src/tests/samples/module2.py
@@ -0,0 +1,7 @@
+# This sample tests that a module is assignable
+# to the built-in type "ModuleType".
+
+import typing
+import importlib
+
+importlib.reload(typing)
diff --git a/server/src/tests/typeAnalyzer.test.ts b/server/src/tests/typeAnalyzer.test.ts
@@ -331,6 +331,12 @@ test('Module1', () => {
     validateResults(analysisResults, 0);
 });
 
+test('Module2', () => {
+    let analysisResults = TestUtils.typeAnalyzeSampleFiles(['module2.py']);
+
+    validateResults(analysisResults, 0);
+});
+
 test('Ellipsis1', () => {
     let analysisResults = TestUtils.typeAnalyzeSampleFiles(['ellipsis1.pyi']);