Merge pull request #285 from asottile/more-mock

asottile · web-flow · commit 34ddbd6e7ec5 · 2022-07-10T11:40:49.000-04:00
rewrite more mock attributes
diff --git a/reorder_python_imports.py b/reorder_python_imports.py
@@ -619,7 +619,7 @@ def _fix_file(
 # END GENERATED
 
 # GENERATED VIA generate-mock-info
-# Using mock==4.0.3
+# up until cpython 3.10.0
 REPLACES[(3,)].update((
     'mock.mock=unittest.mock:ANY',
     'mock.mock=unittest.mock:DEFAULT',
@@ -648,6 +648,14 @@ def _fix_file(
     'mock=unittest.mock:patch',
     'mock=unittest.mock:sentinel',
 ))
+REPLACES[(3, 7)].update((
+    'mock.mock=unittest.mock:seal',
+    'mock=unittest.mock:seal',
+))
+REPLACES[(3, 8)].update((
+    'mock.mock=unittest.mock:AsyncMock',
+    'mock=unittest.mock:AsyncMock',
+))
 # END GENERATED
 
 # GENERATED VIA generate-deprecated
diff --git a/testing/generate-mock-info b/testing/generate-mock-info
@@ -1,35 +1,54 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import argparse
+import ast
 import os
+import re
+import subprocess
 import sys
-import unittest.mock
 
+ALL_RE = re.compile(r'__all__ = (\([^)]+\))')
 
-def main() -> int:
-    assert sys.version_info[:2] == (3, 6), 'needs py36'
-
-    mock = __import__('mock')  # avoid self-rewriting!
 
-    mock_all, mock_version = mock.__all__, mock.__version__
-    unittest_mock_all = unittest.mock.__all__
+def _get_all(cpython: str, version: str) -> frozenset[str]:
+    cmd = ('git', '-C', cpython, 'show', f'{version}:Lib/unittest/mock.py')
+    out = subprocess.check_output(cmd, stderr=subprocess.DEVNULL).decode()
+    match = ALL_RE.search(out)
+    assert match is not None
+    return frozenset(ast.literal_eval(match[1]))
 
-    attrs = set(mock_all).intersection(unittest_mock_all)
 
-    renames_s = '\n'.join(
-        sorted(
-            f"    '{orig_mod}=unittest.mock:{attr}',"
-            for orig_mod in ('mock', 'mock.mock')
-            for attr in attrs
-        ),
-    )
-
-    print(
-        f'# GENERATED VIA {os.path.basename(sys.argv[0])}\n'
-        f'# Using mock=={mock_version}\n'
-        f'REPLACES[(3,)].update((\n{renames_s}\n))\n'
-        f'# END GENERATED\n',
-    )
+def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('cpython')
+    args = parser.parse_args()
+
+    prev = _get_all(args.cpython, 'v3.3.0')
+    to_add: dict[tuple[int, ...], frozenset[str]] = {(3,): prev}
+
+    for minor in range(6, 999):
+        try:
+            new = _get_all(args.cpython, f'v3.{minor}.0')
+        except subprocess.CalledProcessError:
+            break
+
+        if new != prev:
+            to_add[(3, minor)] = new - prev
+            prev = new
+
+    print(f'# GENERATED VIA {os.path.basename(sys.argv[0])}')
+    print(f'# up until cpython 3.{minor - 1}.0')
+    for k, v in sorted(to_add.items()):
+        print(f'REPLACES[{k}].update((')
+        for s in sorted(
+                f"    '{orig_mod}=unittest.mock:{attr}',"
+                for orig_mod in ('mock', 'mock.mock')
+                for attr in v
+        ):
+            print(s)
+        print('))')
+    print('# END GENERATED')
 
     return 0
 
