Merge branch 'master' into pre-commit-ci-update-config

agronholm · web-flow · commit 40f7b7ed07b5 · 2024-09-21T16:41:28.000+03:00
diff --git a/docs/features.rst b/docs/features.rst
@@ -62,7 +62,8 @@ Protocol checking
 +++++++++++++++++
 
 As of version 4.3.0, Typeguard can check instances and classes against Protocols,
-regardless of whether they were annotated with :decorator:`typing.runtime_checkable`.
+regardless of whether they were annotated with
+:func:`@runtime_checkable <typing.runtime_checkable>`.
 
 There are several limitations on the checks performed, however:
 
diff --git a/src/typeguard/_checkers.py b/src/typeguard/_checkers.py
@@ -34,10 +34,7 @@
 from unittest.mock import Mock
 from weakref import WeakKeyDictionary
 
-try:
-    import typing_extensions
-except ImportError:
-    typing_extensions = None  # type: ignore[assignment]
+import typing_extensions
 
 # Must use this because typing.is_typeddict does not recognize
 # TypedDict from typing_extensions, and as of version 4.12.0
@@ -548,15 +545,8 @@ def check_typevar(
             )
 
 
-if typing_extensions is None:
-
-    def _is_literal_type(typ: object) -> bool:
-        return typ is typing.Literal
-
-else:
-
-    def _is_literal_type(typ: object) -> bool:
-        return typ is typing.Literal or typ is typing_extensions.Literal
+def _is_literal_type(typ: object) -> bool:
+    return typ is typing.Literal or typ is typing_extensions.Literal
 
 
 def check_literal(
@@ -905,6 +895,13 @@ def check_type_internal(
     type: check_class,
     Type: check_class,
     Union: check_union,
+    # On some versions of Python, these may simply be re-exports from "typing",
+    # but exactly which Python versions is subject to change.
+    # It's best to err on the safe side and just always specify these.
+    typing_extensions.Literal: check_literal,
+    typing_extensions.LiteralString: check_literal_string,
+    typing_extensions.Self: check_self,
+    typing_extensions.TypeGuard: check_typeguard,
 }
 if sys.version_info >= (3, 10):
     origin_type_checkers[types.UnionType] = check_uniontype
@@ -913,16 +910,6 @@ def check_type_internal(
     origin_type_checkers.update(
         {typing.LiteralString: check_literal_string, typing.Self: check_self}
     )
-if typing_extensions is not None:
-    # On some Python versions, these may simply be re-exports from typing,
-    # but exactly which Python versions is subject to change,
-    # so it's best to err on the safe side
-    # and update the dictionary on all Python versions
-    # if typing_extensions is installed
-    origin_type_checkers[typing_extensions.Literal] = check_literal
-    origin_type_checkers[typing_extensions.LiteralString] = check_literal_string
-    origin_type_checkers[typing_extensions.Self] = check_self
-    origin_type_checkers[typing_extensions.TypeGuard] = check_typeguard
 
 
 def builtin_checker_lookup(
diff --git a/tests/test_importhook.py b/tests/test_importhook.py
@@ -64,5 +64,6 @@ def test_debug_instrumentation(monkeypatch, capsys):
     monkeypatch.setattr("typeguard.config.debug_instrumentation", True)
     import_dummymodule()
     out, err = capsys.readouterr()
-    assert f"Source code of '{dummy_module_path}' after instrumentation:" in err
+    path_str = str(dummy_module_path)
+    assert f"Source code of {path_str!r} after instrumentation:" in err
     assert "class DummyClass" in err
diff --git a/tests/test_typechecked.py b/tests/test_typechecked.py
@@ -619,9 +619,8 @@ def foo(x: int) -> None:
     )
     assert process.returncode == expected_return_code
     if process.returncode == 1:
-        assert process.stderr.endswith(
-            b'typeguard.TypeCheckError: argument "x" (str) is not an instance of '
-            b"int\n"
+        assert process.stderr.strip().endswith(
+            b'typeguard.TypeCheckError: argument "x" (str) is not an instance of int'
         )
 
 

Original file line number	Diff line number	Diff line change
`@@ -619,9 +619,8 @@ def foo(x: int) -> None:`
`619`	`619`	`)`
`620`	`620`	`assert process.returncode == expected_return_code`
`621`	`621`	`if process.returncode == 1:`
`622`		`- assert process.stderr.endswith(`
`623`		`- b'typeguard.TypeCheckError: argument "x" (str) is not an instance of '`
`624`		`- b"int\n"`
	`622`	`+ assert process.stderr.strip().endswith(`
	`623`	`+ b'typeguard.TypeCheckError: argument "x" (str) is not an instance of int'`
`625`	`624`	`)`
`626`	`625`
`627`	`626`