Merge branch 'master' into better-incompatible-messages

Author: atakiar

docs/source/command_line.rst

@@ -876,8 +876,11 @@ Miscellaneous
 
     This flag causes mypy to install known missing stub packages for
     third-party libraries using pip.  It will display the pip command
-    line to run, and expects a confirmation before installing
-    anything.
+    that will be run, and expects a confirmation before installing
+    anything. For security reasons, these stubs are limited to only a
+    small subset of manually selected packages that have been
+    verified by the typeshed team. These packages include only stub
+    files and no executable code.
 
     If you use this option without providing any files or modules to
     type check, mypy will install stub packages suggested during the
@@ -889,8 +892,8 @@ Miscellaneous
     .. note::
 
         This is new in mypy 0.900. Previous mypy versions included a
-        selection of third-party package stubs, instead of having them
-        installed separately.
+        selection of third-party package stubs, instead of having
+        them installed separately.
 
 .. option:: --junit-xml JUNIT_XML
 

mypy/build.py

@@ -2555,7 +2555,7 @@ def module_not_found(manager: BuildManager, line: int, caller_state: State,
             if '{stub_dist}' in note:
                 note = note.format(stub_dist=legacy_bundled_packages[top_level])
             errors.report(line, 0, note, severity='note', only_once=True, code=codes.IMPORT)
-        if reason is ModuleNotFoundReason.STUBS_NOT_INSTALLED:
+        if reason is ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED:
             manager.missing_stub_packages.add(legacy_bundled_packages[top_level])
     errors.set_import_context(save_import_context)
 

mypy/modulefinder.py

@@ -57,7 +57,7 @@ class ModuleNotFoundReason(Enum):
     WRONG_WORKING_DIRECTORY = 2
 
     # Stub PyPI package (typically types-pkgname) known to exist but not installed.
-    STUBS_NOT_INSTALLED = 3
+    APPROVED_STUBS_NOT_INSTALLED = 3
 
     def error_message_templates(self, daemon: bool) -> Tuple[str, List[str]]:
         doc_link = "See https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports"
@@ -71,7 +71,7 @@ def error_message_templates(self, daemon: bool) -> Tuple[str, List[str]]:
         elif self is ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS:
             msg = 'Skipping analyzing "{module}": found module but no type hints or library stubs'
             notes = [doc_link]
-        elif self is ModuleNotFoundReason.STUBS_NOT_INSTALLED:
+        elif self is ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED:
             msg = (
                 'Library stubs not installed for "{module}" (or incompatible with Python {pyver})'
             )
@@ -231,7 +231,7 @@ def _find_module_non_stub_helper(self, components: List[str],
                                           or self.fscache.isfile(dir_path + ".py")):
                 plausible_match = True
         if components[0] in legacy_bundled_packages:
-            return ModuleNotFoundReason.STUBS_NOT_INSTALLED
+            return ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED
         elif plausible_match:
             return ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS
         else:
@@ -311,7 +311,7 @@ def _find_module(self, id: str, use_typeshed: bool) -> ModuleSearchResult:
             if isinstance(non_stub_match, ModuleNotFoundReason):
                 if non_stub_match is ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS:
                     found_possible_third_party_missing_type_hints = True
-                elif non_stub_match is ModuleNotFoundReason.STUBS_NOT_INSTALLED:
+                elif non_stub_match is ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED:
                     need_installed_stubs = True
             else:
                 third_party_inline_dirs.append(non_stub_match)
@@ -413,7 +413,7 @@ def _find_module(self, id: str, use_typeshed: bool) -> ModuleSearchResult:
             return ancestor
 
         if need_installed_stubs:
-            return ModuleNotFoundReason.STUBS_NOT_INSTALLED
+            return ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED
         elif found_possible_third_party_missing_type_hints:
             return ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS
         else: