Merge branch 'main' into capi-pep

.github/CODEOWNERS

@@ -609,6 +609,7 @@ peps/pep-0727.rst  @JelleZijlstra
 peps/pep-0729.rst  @JelleZijlstra @hauntsaninja
 peps/pep-0730.rst  @ned-deily
 peps/pep-0731.rst  @gvanrossum @encukou @vstinner @zooba @iritkatriel
+peps/pep-0732.rst  @Mariatta
 peps/pep-0733.rst  @encukou @vstinner @zooba @iritkatriel
 # ...
 # peps/pep-0754.rst

peps/pep-0696.rst

@@ -2,7 +2,7 @@ PEP: 696
 Title: Type defaults for TypeVarLikes
 Author: James Hilton-Balfe <[email protected]>
 Sponsor: Jelle Zijlstra <[email protected]>
-Discussions-To: https://mail.python.org/archives/list/[email protected]/thread/7VWBZWXTCX6RAJO6GG67BAXUPFZ24NTC
+Discussions-To: https://discuss.python.org/t/pep-696-type-defaults-for-typevarlikes/22569
 Status: Draft
 Type: Standards Track
 Topic: Typing

peps/pep-0698.rst

@@ -196,7 +196,7 @@ method or attribute in some ancestor class.
             return 2
 
         @override
-        def baz() -> int:  # Type check error: no matching signature in ancestor
+        def baz(self) -> int:  # Type check error: no matching signature in ancestor
             return 1
 
 
@@ -240,20 +240,20 @@ Consider the following code:
         pass
 
     class Child(Parent):
-        def foo() -> int:
+        def foo(self) -> int:
             return 2
 
 Imagine we refactor it as follows:
 
 
 .. code-block:: python
 
-    class Parent
-        def foo() -> int:   # This method is new
+    class Parent:
+        def foo(self) -> int:   # This method is new
             return 1
 
     class Child(Parent):
-        def foo() -> int:  # This is now an override!
+        def foo(self) -> int:  # This is now an override!
             return 2
 
     def call_foo(parent: Parent) -> int:
@@ -416,22 +416,22 @@ ancestor class where the overridden method should be defined:
 .. code-block:: python
 
     class Parent0:
-        def foo() -> int:
+        def foo(self) -> int:
             return 1
 
 
     class Parent1:
-        def bar() -> int:
+        def bar(self) -> int:
             return 1
 
 
     class Child(Parent0, Parent1):
         @override(Parent0)  # okay, Parent0 defines foo
-        def foo() -> int:
+        def foo(self) -> int:
             return 2
 
         @override(Parent0)  # type error, Parent0 does not define bar
-        def bar() -> int:
+        def bar(self) -> int:
             return 2
 
 

peps/pep-0702.rst

@@ -115,6 +115,8 @@ The decorator takes the following arguments:
 
 The positional-only argument is of type ``str`` and contains a message that should
 be shown by the type checker when it encounters a usage of the decorated object.
+Tools may clean up the deprecation message for display, for example
+by using :func:`inspect.cleandoc` or equivalent logic.
 The message must be a string literal.
 The content of deprecation messages is up to the user, but it may include the version
 in which the deprecated object is to be removed, and information about suggested