Merge branch 'main' into patch-14

python · rhettinger · Oct 9, 2022 · Mar 17, 2021 · Mar 17, 2021 · Mar 17, 2021
commit 0a132bf66953bd857a6d3f0f24a1c1d6e6e8168c
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
@@ -1351,7 +1351,9 @@ Using the non-data descriptor protocol, a pure Python version of
             if cls is None:
                 cls = type(obj)
             if hasattr(type(self.f), '__get__'):
-                return self.f.__get__(cls)
+                # This code path was added in Python 3.9
+                # and was deprecated in Python 3.11.
+                return self.f.__get__(cls, cls)
             return MethodType(self.f, cls)
 
 .. testcode::
@@ -1380,9 +1382,15 @@ Using the non-data descriptor protocol, a pure Python version of
     >>> t.cm(11, 22)
     (<class 'T'>, 11, 22)
 
-The code path for ``hasattr(type(self.f), '__get__')`` was added in Python 3.9 and
-makes it possible for :func:`classmethod` to support chained decorators.
-For example, a classmethod and property could be chained together:
+    # Check the alternate path for chained descriptors
+    >>> T.__doc__
+    "A doc for 'T'"
+
+
+The code path for ``hasattr(type(self.f), '__get__')`` was added in
+Python 3.9 and makes it possible for :func:`classmethod` to support
+chained decorators.  For example, a classmethod and property could be
+chained together.  In Python 3.11, this functionality was deprecated.
 
 .. testcode::