Simplify stubinfo without Python 2 (#13265)

Author: hauntsaninja

mypy/build.py

@@ -2620,12 +2620,8 @@ def find_module_and_diagnose(
         # otherwise updating mypy can silently result in new false
         # negatives. (Unless there are stubs but they are incomplete.)
         global_ignore_missing_imports = manager.options.ignore_missing_imports
-        py_ver = options.python_version[0]
         if (
-            (
-                is_legacy_bundled_package(top_level, py_ver)
-                or is_legacy_bundled_package(second_level, py_ver)
-            )
+            (is_legacy_bundled_package(top_level) or is_legacy_bundled_package(second_level))
             and global_ignore_missing_imports
             and not options.ignore_missing_imports_per_module
             and result is ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED
@@ -2743,10 +2739,10 @@ def module_not_found(
             top_level = second_level
         for note in notes:
             if "{stub_dist}" in note:
-                note = note.format(stub_dist=legacy_bundled_packages[top_level].name)
+                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.APPROVED_STUBS_NOT_INSTALLED:
-            manager.missing_stub_packages.add(legacy_bundled_packages[top_level].name)
+            manager.missing_stub_packages.add(legacy_bundled_packages[top_level])
     errors.set_import_context(save_import_context)
 
 

mypy/modulefinder.py

@@ -343,13 +343,13 @@ def _find_module_non_stub_helper(
             # If this is not a directory then we can't traverse further into it
             if not self.fscache.isdir(dir_path):
                 break
-        if is_legacy_bundled_package(components[0], self.python_major_ver):
+        if is_legacy_bundled_package(components[0]):
             if len(components) == 1 or (
                 self.find_module(components[0])
                 is ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED
             ):
                 return ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED
-        if is_legacy_bundled_package(".".join(components[:2]), self.python_major_ver):
+        if is_legacy_bundled_package(".".join(components[:2])):
             return ModuleNotFoundReason.APPROVED_STUBS_NOT_INSTALLED
         if plausible_match:
             return ModuleNotFoundReason.FOUND_WITHOUT_TYPE_HINTS

mypy/stubinfo.py

@@ -1,18 +1,5 @@
-from typing import Optional
-
-
-class StubInfo:
-    def __init__(self, name: str, py_version: Optional[int] = None) -> None:
-        self.name = name
-        # If None, compatible with py2+py3, if 2/3, only compatible with py2/py3
-        self.py_version = py_version
-
-
-def is_legacy_bundled_package(prefix: str, py_version: int) -> bool:
-    if prefix not in legacy_bundled_packages:
-        return False
-    package_ver = legacy_bundled_packages[prefix].py_version
-    return package_ver is None or package_ver == py_version
+def is_legacy_bundled_package(prefix: str) -> bool:
+    return prefix in legacy_bundled_packages
 
 
 # Stubs for these third-party packages used to be shipped with mypy.
@@ -21,56 +8,56 @@ def is_legacy_bundled_package(prefix: str, py_version: int) -> bool:
 #
 # Package name can have one or two components ('a' or 'a.b').
 legacy_bundled_packages = {
-    "aiofiles": StubInfo("types-aiofiles", py_version=3),
-    "atomicwrites": StubInfo("types-atomicwrites"),
-    "attr": StubInfo("types-attrs"),
-    "backports": StubInfo("types-backports"),
-    "backports_abc": StubInfo("types-backports_abc"),
-    "bleach": StubInfo("types-bleach"),
-    "boto": StubInfo("types-boto"),
-    "cachetools": StubInfo("types-cachetools"),
-    "chardet": StubInfo("types-chardet"),
-    "click_spinner": StubInfo("types-click-spinner"),
-    "contextvars": StubInfo("types-contextvars", py_version=3),
-    "croniter": StubInfo("types-croniter"),
-    "dataclasses": StubInfo("types-dataclasses", py_version=3),
-    "dateparser": StubInfo("types-dateparser"),
-    "datetimerange": StubInfo("types-DateTimeRange"),
-    "dateutil": StubInfo("types-python-dateutil"),
-    "decorator": StubInfo("types-decorator"),
-    "deprecated": StubInfo("types-Deprecated"),
-    "docutils": StubInfo("types-docutils", py_version=3),
-    "emoji": StubInfo("types-emoji"),
-    "first": StubInfo("types-first"),
-    "geoip2": StubInfo("types-geoip2"),
-    "gflags": StubInfo("types-python-gflags"),
-    "google.protobuf": StubInfo("types-protobuf"),
-    "markdown": StubInfo("types-Markdown"),
-    "maxminddb": StubInfo("types-maxminddb"),
-    "mock": StubInfo("types-mock"),
-    "OpenSSL": StubInfo("types-pyOpenSSL"),
-    "paramiko": StubInfo("types-paramiko"),
-    "pkg_resources": StubInfo("types-setuptools", py_version=3),
-    "polib": StubInfo("types-polib"),
-    "pycurl": StubInfo("types-pycurl"),
-    "pymysql": StubInfo("types-PyMySQL"),
-    "pyrfc3339": StubInfo("types-pyRFC3339", py_version=3),
-    "python2": StubInfo("types-six"),
-    "pytz": StubInfo("types-pytz"),
-    "pyVmomi": StubInfo("types-pyvmomi"),
-    "redis": StubInfo("types-redis"),
-    "requests": StubInfo("types-requests"),
-    "retry": StubInfo("types-retry"),
-    "simplejson": StubInfo("types-simplejson"),
-    "singledispatch": StubInfo("types-singledispatch"),
-    "six": StubInfo("types-six"),
-    "slugify": StubInfo("types-python-slugify"),
-    "tabulate": StubInfo("types-tabulate"),
-    "termcolor": StubInfo("types-termcolor"),
-    "toml": StubInfo("types-toml"),
-    "typed_ast": StubInfo("types-typed-ast", py_version=3),
-    "tzlocal": StubInfo("types-tzlocal"),
-    "ujson": StubInfo("types-ujson"),
-    "waitress": StubInfo("types-waitress", py_version=3),
-    "yaml": StubInfo("types-PyYAML"),
+    "aiofiles": "types-aiofiles",
+    "atomicwrites": "types-atomicwrites",
+    "attr": "types-attrs",
+    "backports": "types-backports",
+    "backports_abc": "types-backports_abc",
+    "bleach": "types-bleach",
+    "boto": "types-boto",
+    "cachetools": "types-cachetools",
+    "chardet": "types-chardet",
+    "click_spinner": "types-click-spinner",
+    "contextvars": "types-contextvars",
+    "croniter": "types-croniter",
+    "dataclasses": "types-dataclasses",
+    "dateparser": "types-dateparser",
+    "datetimerange": "types-DateTimeRange",
+    "dateutil": "types-python-dateutil",
+    "decorator": "types-decorator",
+    "deprecated": "types-Deprecated",
+    "docutils": "types-docutils",
+    "emoji": "types-emoji",
+    "first": "types-first",
+    "geoip2": "types-geoip2",
+    "gflags": "types-python-gflags",
+    "google.protobuf": "types-protobuf",
+    "markdown": "types-Markdown",
+    "maxminddb": "types-maxminddb",
+    "mock": "types-mock",
+    "OpenSSL": "types-pyOpenSSL",
+    "paramiko": "types-paramiko",
+    "pkg_resources": "types-setuptools",
+    "polib": "types-polib",
+    "pycurl": "types-pycurl",
+    "pymysql": "types-PyMySQL",
+    "pyrfc3339": "types-pyRFC3339",
+    "python2": "types-six",
+    "pytz": "types-pytz",
+    "pyVmomi": "types-pyvmomi",
+    "redis": "types-redis",
+    "requests": "types-requests",
+    "retry": "types-retry",
+    "simplejson": "types-simplejson",
+    "singledispatch": "types-singledispatch",
+    "six": "types-six",
+    "slugify": "types-python-slugify",
+    "tabulate": "types-tabulate",
+    "termcolor": "types-termcolor",
+    "toml": "types-toml",
+    "typed_ast": "types-typed-ast",
+    "tzlocal": "types-tzlocal",
+    "ujson": "types-ujson",
+    "waitress": "types-waitress",
+    "yaml": "types-PyYAML",
 }

mypy/test/teststubinfo.py

@@ -5,11 +5,6 @@
 
 class TestStubInfo(unittest.TestCase):
     def test_is_legacy_bundled_packages(self) -> None:
-        assert not is_legacy_bundled_package("foobar_asdf", 2)
-        assert not is_legacy_bundled_package("foobar_asdf", 3)
-
-        assert is_legacy_bundled_package("pycurl", 2)
-        assert is_legacy_bundled_package("pycurl", 3)
-
-        assert not is_legacy_bundled_package("dataclasses", 2)
-        assert is_legacy_bundled_package("dataclasses", 3)
+        assert not is_legacy_bundled_package("foobar_asdf")
+        assert is_legacy_bundled_package("pycurl")
+        assert is_legacy_bundled_package("dataclasses")