@@ -12,14 +12,14 @@
 
 import argparse
 import os
-import re
 import sys
 import traceback
-from typing import List, Match, Optional, Sequence, Tuple
+from typing import List, Optional, Sequence, Tuple
 
 from pytype import config as pytype_config, load_pytd
+from pytype.pytd import typeshed
 
-TYPESHED_SUBDIRS = ["stdlib", "third_party"]
+TYPESHED_SUBDIRS = ["stdlib", "stubs"]
 
 
 TYPESHED_HOME = "TYPESHED_HOME"
@@ -61,31 +61,6 @@ def create_parser() -> argparse.ArgumentParser:
     return parser
 
 
-class PathMatcher:
-    def __init__(self, patterns: Sequence[str]) -> None:
-        patterns = [re.escape(os.path.join(*x.split("/"))) for x in patterns]
-        self.matcher = re.compile(r"({})$".format("|".join(patterns))) if patterns else None
-
-    def search(self, path: str) -> Optional[Match[str]]:
-        if not self.matcher:
-            return None
-        return self.matcher.search(path)
-
-
-def load_exclude_list(typeshed_location: str) -> List[str]:
-    filename = os.path.join(typeshed_location, "tests", "pytype_exclude_list.txt")
-    skip_re = re.compile(r"^\s*([^\s#]+)\s*(?:#.*)?$")
-    skip = []
-
-    with open(filename) as f:
-        for line in f:
-            skip_match = skip_re.match(line)
-            if skip_match:
-                skip.append(skip_match.group(1))
-
-    return skip
-
-
 def run_pytype(*, filename: str, python_version: str, typeshed_location: str) -> Optional[str]:
     """Runs pytype, returning the stderr if any."""
     if python_version not in _LOADERS:
@@ -125,7 +100,15 @@ def _get_relative(filename: str) -> str:
 
 def _get_module_name(filename: str) -> str:
     """Converts a filename {subdir}/m.n/module/foo to module.foo."""
-    return ".".join(_get_relative(filename).split(os.path.sep)[2:]).replace(".pyi", "").replace(".__init__", "")
+    parts = _get_relative(filename).split(os.path.sep)
+    if "@python2" in parts:
+        module_parts = parts[parts.index("@python2") + 1:]
+    elif parts[0] == "stdlib":
+        module_parts = parts[1:]
+    else:
+        assert parts[0] == "stubs"
+        module_parts = parts[2:]
+    return ".".join(module_parts).replace(".pyi", "").replace(".__init__", "")
 
 
 def _is_version(path: str, version: str) -> bool:
@@ -142,20 +125,17 @@ def determine_files_to_test(*, typeshed_location: str, paths: Sequence[str]) ->
     """Determine all files to test, checking if it's in the exclude list and which Python versions to use.
 
     Returns a list of pairs of the file path and Python version as an int."""
-    skipped = PathMatcher(load_exclude_list(typeshed_location))
     filenames = find_stubs_in_paths(paths)
+    ts = typeshed.Typeshed()
+    skipped = set(ts.read_blacklist())
     files = []
     for f in sorted(filenames):
         rel = _get_relative(f)
-        if skipped.search(rel):
+        if rel in skipped:
             continue
-        if _is_version(f, "2and3"):
-            files.append((f, 2))
-            files.append((f, 3))
-        elif _is_version(f, "2"):
-            files.append((f, 2))
-        elif _is_version(f, "3"):
-            files.append((f, 3))
+        versions = ts.get_python_major_versions(rel)
+        if versions:
+            files.extend((f, v) for v in versions)
         else:
             print("Unrecognized path: {}".format(f))
     return files
@@ -178,10 +158,11 @@ def run_all_tests(*, files_to_test: Sequence[Tuple[str, int]], typeshed_location
     total_tests = len(files_to_test)
     print("Testing files with pytype...")
     for i, (f, version) in enumerate(files_to_test):
+        python_version = "2.7" if version == 2 else "{0.major}.{0.minor}".format(sys.version_info)
         stderr = (
             run_pytype(
                 filename=f,
-                python_version="2.7" if version == 2 else "{0.major}.{0.minor}".format(sys.version_info),
+                python_version=python_version,
                 typeshed_location=typeshed_location,
             )
             if not dry_run
@@ -192,15 +173,15 @@ def run_all_tests(*, files_to_test: Sequence[Tuple[str, int]], typeshed_location
                 print(stderr)
             errors += 1
             stacktrace_final_line = stderr.rstrip().rsplit("\n", 1)[-1]
-            bad.append((_get_relative(f), stacktrace_final_line))
+            bad.append((_get_relative(f), python_version, stacktrace_final_line))
 
         runs = i + 1
         if runs % 25 == 0:
             print("  {:3d}/{:d} with {:3d} errors".format(runs, total_tests, errors))
 
     print("Ran pytype with {:d} pyis, got {:d} errors.".format(total_tests, errors))
-    for f, err in bad:
-        print("{}: {}".format(f, err))
+    for f, v, err in bad:
+        print("{} ({}): {}".format(f, v, err))
     if errors:
         raise SystemExit("\nRun again with --print-stderr to get the full stacktrace.")