From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Sat, 29 Jul 2023 12:39:21 +0000 (+0100)
Subject: gh-104050: Argument clinic: enable mypy's `--warn-return-any` setting (#107405)
X-Git-Tag: v3.13.0a1~1142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87de2fbb1e9b94f25ae8c0c233fb4690a13e4b02;p=thirdparty%2FPython%2Fcpython.git

gh-104050: Argument clinic: enable mypy's `--warn-return-any` setting (#107405)
---

diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index 6bfa6d0d5681..cb999c156ee2 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -4288,10 +4288,11 @@ def eval_ast_expr(
         globals: dict[str, Any],
         *,
         filename: str = '-'
-) -> FunctionType:
+) -> Any:
     """
-    Takes an ast.Expr node.  Compiles and evaluates it.
-    Returns the result of the expression.
+    Takes an ast.Expr node.  Compiles it into a function object,
+    then calls the function object with 0 arguments.
+    Returns the result of that function call.
 
     globals represents the globals dict the expression
     should see.  (There's no equivalent for "locals" here.)
diff --git a/Tools/clinic/mypy.ini b/Tools/clinic/mypy.ini
index 4aa65a5c1448..4cfc05bec016 100644
--- a/Tools/clinic/mypy.ini
+++ b/Tools/clinic/mypy.ini
@@ -5,11 +5,8 @@ pretty = True
 # make sure clinic can still be run on Python 3.10
 python_version = 3.10
 
-# be strict...
+# and be strict!
 strict = True
 strict_concatenate = True
 enable_error_code = ignore-without-code,redundant-expr
 warn_unreachable = True
-
-# ...except for one extra rule we can't enable just yet
-warn_return_any = False