Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.10] bpo-42073: allow classmethod to wrap other classmethod-like descriptors (GH-27115) #27162

Merged
merged 1 commit into from
Jul 15, 2021

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 15, 2021

Patch by Erik Welch.

bpo-19072 (GH-8405) allows classmethod to wrap other descriptors, but this does
not 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):

class A:
    @myclassmethod
    def f1(cls):
        return cls

    @classmethod
    @myclassmethod
    def f2(cls):
        return cls

In Python 3.8 and before, A.f2() return A. Currently in Python 3.9, it
returns type(A). This PR make A.f2() return A again.

As of GH-8405, classmethod calls obj.__get__(type) if obj has __get__.
This allows one to chain @classmethod and @property together. When
using classmethod-like descriptors, it's the second argument to __get__--the
owner 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, not type(A)).

This PR updates classmethod to call obj.__get__(type, type) if obj 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

…rs (pythonGH-27115)

Patch by Erik Welch.

bpo-19072 (pythonGH-8405) allows `classmethod` to wrap other descriptors, but this does
not 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):
```python
class A:
    @myclassmethod
    def f1(cls):
        return cls

    @classmethod
    @myclassmethod
    def f2(cls):
        return cls
```
In Python 3.8 and before, `A.f2()` return `A`. Currently in Python 3.9, it
returns `type(A)`.  This PR make `A.f2()` return `A` again.

As of pythonGH-8405, classmethod calls `obj.__get__(type)` if `obj` has `__get__`.
This allows one to chain `@classmethod` and `@property` together.  When
using classmethod-like descriptors, it's the second argument to `__get__`--the
owner 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`, not `type(A)`).

This PR updates classmethod to call `obj.__get__(type, type)` if `obj` 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>
@miss-islington
Copy link
Contributor Author

@ambv: Status check is done, and it's a success ✅ .

@ambv ambv merged commit 2ce8af3 into python:3.10 Jul 15, 2021
@miss-islington miss-islington deleted the backport-b83861f-3.10 branch July 15, 2021 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants