[3.10] bpo-42073: allow classmethod to wrap other classmethod-like descriptors (GH-27115) #27162
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Patch by Erik Welch.
bpo-19072 (GH-8405) allows
classmethod
to wrap other descriptors, but this doesnot work when the wrapped descriptor mimics classmethod. The current PR fixes
this.
In Python 3.8 and before, one could create a callable descriptor such that this
works as expected (see Lib/test/test_decorators.py for examples):
In Python 3.8 and before,
A.f2()
returnA
. Currently in Python 3.9, itreturns
type(A)
. This PR makeA.f2()
returnA
again.As of GH-8405, classmethod calls
obj.__get__(type)
ifobj
has__get__
.This allows one to chain
@classmethod
and@property
together. Whenusing classmethod-like descriptors, it's the second argument to
__get__
--theowner or the type--that is important, but this argument is currently missing.
Since it is None, the "owner" argument is assumed to be the type of the first
argument, which, in this case, is wrong (we want
A
, nottype(A)
).This PR updates classmethod to call
obj.__get__(type, type)
ifobj
has__get__
.Co-authored-by: Erik Welch erik.n.welch@gmail.com
(cherry picked from commit b83861f)
Co-authored-by: Łukasz Langa lukasz@langa.pl
https://bugs.python.org/issue42073