Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Doc/howto/descriptor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ Using the non-data descriptor protocol, a pure Python version of
def __get__(self, obj, cls=None):
if cls is None:
cls = type(obj)
if hasattr(obj, '__get__'):
if hasattr(type(self.f), '__get__'):
return self.f.__get__(cls)
return MethodType(self.f, cls)

Expand All @@ -1342,6 +1342,12 @@ Using the non-data descriptor protocol, a pure Python version of
def cm(cls, x, y):
return (cls, x, y)

@ClassMethod
@property
def __doc__(cls):
return f'A doc for {cls.__name__!r}'


.. doctest::
:hide:

Expand All @@ -1353,6 +1359,11 @@ Using the non-data descriptor protocol, a pure Python version of
>>> t.cm(11, 22)
(<class 'T'>, 11, 22)

# Check the alternate path for chained descriptors
>>> T.__doc__
"A doc for 'T'"


The code path for ``hasattr(obj, '__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:
Expand Down
3 changes: 2 additions & 1 deletion Misc/ACKS
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Brian Curtin
Jason Curtis
Hakan Celik
Paul Dagnelie
Florian Dahlitz
Florian Dahlitz
Lisandro Dalcin
Darren Dale
Andrew Dalke
Expand Down Expand Up @@ -694,6 +694,7 @@ Michael Haubenwallner
Janko Hauser
Flavian Hautbois
Rycharde Hawkes
Yahor Harunovich
Ben Hayden
Jochen Hayek
Tim Heaney
Expand Down