From d0e15357c2300964b8006edf1db4d1b65ac6b411 Mon Sep 17 00:00:00 2001 From: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Date: Mon, 27 Jan 2025 00:14:51 +0100 Subject: [PATCH] Suggest typing.Literal for exit-return error messages --- mypy/messages.py | 2 +- test-data/unit/check-errorcodes.test | 2 +- test-data/unit/check-statements.test | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mypy/messages.py b/mypy/messages.py index c5245daabaa5..04ab40fc4474 100644 --- a/mypy/messages.py +++ b/mypy/messages.py @@ -1992,7 +1992,7 @@ def incorrect__exit__return(self, context: Context) -> None: code=codes.EXIT_RETURN, ) self.note( - 'Use "typing_extensions.Literal[False]" as the return type or change it to "None"', + 'Use "typing.Literal[False]" as the return type or change it to "None"', context, code=codes.EXIT_RETURN, ) diff --git a/test-data/unit/check-errorcodes.test b/test-data/unit/check-errorcodes.test index 294038664415..af311b5334b0 100644 --- a/test-data/unit/check-errorcodes.test +++ b/test-data/unit/check-errorcodes.test @@ -729,7 +729,7 @@ main:2: error: Syntax error in type comment "int" [syntax] [case testErrorCode__exit__Return] class InvalidReturn: def __exit__(self, x, y, z) -> bool: # E: "bool" is invalid as return type for "__exit__" that always returns False [exit-return] \ -# N: Use "typing_extensions.Literal[False]" as the return type or change it to "None" \ +# N: Use "typing.Literal[False]" as the return type or change it to "None" \ # N: If return type of "__exit__" implies that it may return True, the context manager may swallow exceptions return False [builtins fixtures/bool.pyi] diff --git a/test-data/unit/check-statements.test b/test-data/unit/check-statements.test index 48e0f2aa681f..1650a6948c93 100644 --- a/test-data/unit/check-statements.test +++ b/test-data/unit/check-statements.test @@ -1527,13 +1527,13 @@ from typing import Optional class InvalidReturn1: def __exit__(self, x, y, z) -> bool: # E: "bool" is invalid as return type for "__exit__" that always returns False \ -# N: Use "typing_extensions.Literal[False]" as the return type or change it to "None" \ +# N: Use "typing.Literal[False]" as the return type or change it to "None" \ # N: If return type of "__exit__" implies that it may return True, the context manager may swallow exceptions return False class InvalidReturn2: def __exit__(self, x, y, z) -> Optional[bool]: # E: "bool" is invalid as return type for "__exit__" that always returns False \ -# N: Use "typing_extensions.Literal[False]" as the return type or change it to "None" \ +# N: Use "typing.Literal[False]" as the return type or change it to "None" \ # N: If return type of "__exit__" implies that it may return True, the context manager may swallow exceptions if int(): return False @@ -1542,7 +1542,7 @@ class InvalidReturn2: class InvalidReturn3: def __exit__(self, x, y, z) -> bool: # E: "bool" is invalid as return type for "__exit__" that always returns False \ -# N: Use "typing_extensions.Literal[False]" as the return type or change it to "None" \ +# N: Use "typing.Literal[False]" as the return type or change it to "None" \ # N: If return type of "__exit__" implies that it may return True, the context manager may swallow exceptions def nested() -> bool: return True