Import of GitHub PR #1644: merge_files should overwrite the existing …

…annotations #1644 Merge e3dadfc into 46acb94 PiperOrigin-RevId: 643926820
google · Jun 17, 2024 · 177c0cb · 177c0cb
1 parent 3956254
commit 177c0cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pytype/tools/merge_pyi/merge_pyi.py b/pytype/tools/merge_pyi/merge_pyi.py
@@ -23,6 +23,7 @@ def _merge_csts(*, py_tree, pyi_tree):
   vis.store_stub_in_context(context, pyi_tree)
   return vis(
       context,
+      overwrite_existing_annotations=True,
       strict_posargs_matching=False,
       strict_annotation_matching=True,
   ).transform_module(py_tree)

diff --git a/pytype/tools/merge_pyi/test_data/defaults.pep484.py b/pytype/tools/merge_pyi/test_data/defaults.pep484.py
@@ -26,7 +26,7 @@ def f6(x:e6=int) -> r6:
     pass
 
 # static analysis would give error here
-def f7(x : int=int):
+def f7(x:e7=int) -> r7:
     pass
 
 def f8(x:e8={1:2}) -> r8:

diff --git a/pytype/tools/merge_pyi/test_data/partial.pep484.py b/pytype/tools/merge_pyi/test_data/partial.pep484.py
@@ -1,7 +1,7 @@
-def f1(a, b : int):
+def f1(a: e1, b: e2) -> r1:
     pass
 
-def f2(a, b) -> int:
+def f2(a: e1, b: e2) -> r2:
     pass
 
 def f3(a) -> r3: