Try different name for the flag

python · ilevkivskyi · Aug 13, 2023 · Aug 10, 2023 · Aug 11, 2023 · Aug 11, 2023
commit 83df5ddfa33d72074788e3181eaa85a43a4e0712
diff --git a/docs/source/command_line.rst b/docs/source/command_line.rst
@@ -350,18 +350,18 @@ definitions or calls.
     This flag reports an error whenever a function with type annotations
     calls a function defined without annotations.
 
-.. option:: --untyped-call-exception
+.. option:: --untyped-calls-exclude
 
     This flag allows to selectively disable :option:`--disallow-untyped-calls`
     for functions and methods defined in specific packages, modules, or classes.
-    Note that each exception entry acts as a prefix. For example (assuming there
+    Note that each exclude entry acts as a prefix. For example (assuming there
     are no type annotations for ``third_party_lib`` available):
 
     .. code-block:: python
 
         # mypy --disallow-untyped-calls
-        #      --untyped-call-exception=third_party_lib.module_a
-        #      --untyped-call-exception=foo.A
+        #      --untyped-calls-exclude=third_party_lib.module_a
+        #      --untyped-calls-exclude=foo.A
         from third_party_lib.module_a import some_func
         from third_party_lib.module_b import other_func
         import foo

diff --git a/docs/source/config_file.rst b/docs/source/config_file.rst
@@ -505,23 +505,23 @@ section of the command line docs.
     will disable this check inside ``some.library``, not for your code that
     imports ``some.library``. If you want to selectively disable this check for
     all your code that imports ``some.library`` you should instead use
-    :confval:`untyped_call_exception`, for example:
+    :confval:`untyped_calls_exclude`, for example:
 
     .. code-block:: ini
 
         [mypy]
         disallow_untyped_calls = True
-        untyped_call_exception = some.library
+        untyped_calls_exclude = some.library
 
-.. confval:: untyped_call_exception
+.. confval:: untyped_calls_exclude
 
     :type: comma-separated list of strings
 
     Selectively excludes functions and methods defined in specific packages,
     modules, and classes from action of :confval:`disallow_untyped_calls`.
     This also applies to all submodules of packages (i.e. everything inside
     a given prefix). Note, this option does not support per-file configuration,
-    the exception list is defined globally for all your code.
+    the exclusions list is defined globally for all your code.
 
 .. confval:: disallow_untyped_defs
 

diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -566,7 +566,7 @@ def visit_call_expr_inner(self, e: CallExpr, allow_none_return: bool = False) ->
                 fullname = self.method_fullname(object_type, member)
             if not fullname or not any(
                 fullname == p or fullname.startswith(f"{p}.")
-                for p in self.chk.options.untyped_call_exception
+                for p in self.chk.options.untyped_calls_exclude
             ):
                 self.msg.untyped_function_call(callee_type, e)
 

diff --git a/mypy/config_parser.py b/mypy/config_parser.py
@@ -178,7 +178,7 @@ def split_commas(value: str) -> list[str]:
     "plugins": lambda s: [p.strip() for p in split_commas(s)],
     "always_true": lambda s: [p.strip() for p in split_commas(s)],
     "always_false": lambda s: [p.strip() for p in split_commas(s)],
-    "untyped_call_exception": lambda s: validate_package_allow_list(
+    "untyped_calls_exclude": lambda s: validate_package_allow_list(
         [p.strip() for p in split_commas(s)]
     ),
     "enable_incomplete_feature": lambda s: [p.strip() for p in split_commas(s)],
@@ -204,7 +204,7 @@ def split_commas(value: str) -> list[str]:
         "plugins": try_split,
         "always_true": try_split,
         "always_false": try_split,
-        "untyped_call_exception": lambda s: validate_package_allow_list(try_split(s)),
+        "untyped_calls_exclude": lambda s: validate_package_allow_list(try_split(s)),
         "enable_incomplete_feature": try_split,
         "disable_error_code": lambda s: validate_codes(try_split(s)),
         "enable_error_code": lambda s: validate_codes(try_split(s)),

diff --git a/mypy/main.py b/mypy/main.py
@@ -681,7 +681,7 @@ def add_invertible_flag(
         group=untyped_group,
     )
     untyped_group.add_argument(
-        "--untyped-call-exception",
+        "--untyped-calls-exclude",
         metavar="MODULE",
         action="append",
         default=[],
@@ -1320,7 +1320,7 @@ def set_strict_flags() -> None:
             % ", ".join(sorted(overlap))
         )
 
-    validate_package_allow_list(options.untyped_call_exception)
+    validate_package_allow_list(options.untyped_calls_exclude)
 
     # Process `--enable-error-code` and `--disable-error-code` flags
     disabled_codes = set(options.disable_error_code)

diff --git a/mypy/options.py b/mypy/options.py
@@ -138,7 +138,7 @@ def __init__(self) -> None:
 
         # Always allow untyped calls for function coming from modules/packages
         # in this list (each item effectively acts as a prefix match)
-        self.untyped_call_exception: list[str] = []
+        self.untyped_calls_exclude: list[str] = []
 
         # Disallow defining untyped (or incompletely typed) functions
         self.disallow_untyped_defs = False

diff --git a/test-data/unit/check-flags.test b/test-data/unit/check-flags.test
@@ -2078,7 +2078,7 @@ f(reveal_type(y)) # E: Call to untyped function "f" in typed context \
                   # N: Revealed type is "builtins.int"
 
 [case testDisallowUntypedCallsAllowListFlags]
-# flags: --disallow-untyped-calls  --untyped-call-exception=foo --untyped-call-exception=bar.A
+# flags: --disallow-untyped-calls  --untyped-calls-exclude=foo --untyped-calls-exclude=bar.A
 from foo import test_foo
 from bar import A, B
 from baz import test_baz
@@ -2130,7 +2130,7 @@ def test_baz(x): pass
 [file mypy.ini]
 \[mypy]
 disallow_untyped_calls = True
-untyped_call_exception = foo, bar.A
+untyped_calls_exclude = foo, bar.A
 
 [case testPerModuleErrorCodes]
 # flags: --config-file tmp/mypy.ini