Skip to content

bpo-42073: allow classmethod to wrap other classmethod-like descriptors #27115

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

Merged
merged 4 commits into from
Jul 15, 2021

Conversation

ambv
Copy link
Contributor

@ambv ambv commented Jul 13, 2021

Patch by Erik Welch.

bpo-19072 (#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 #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


Original patch was on the 3.9 branch so I recreated it on main. Passes -uall.

https://bugs.python.org/issue42073

@ambv
Copy link
Contributor Author

ambv commented Jul 13, 2021

This is weird, the Intel Windows builds are reliably failing on Azure Pipelines on test_httpservers. I'll be trying to repro it with a local Windows VM next.

@ambv
Copy link
Contributor Author

ambv commented Jul 14, 2021

Sigh. I spent time today installing a Windows 10 VM, running updates, installing Visual Studio, configuring a CPython dev environment, and running this PR to test why it fails. I cannot reproduce the Azure Pipelines PR failure on test_httpservers. It passes on my end.

ambv and others added 2 commits July 15, 2021 11:11
Patch by Erik Welch.

bpo-19072 (python#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 python#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>
@ambv
Copy link
Contributor Author

ambv commented Jul 15, 2021

Very suspicious. The latest commit essentially undoes the change in the PR so it's a PR of main. test_httpservers still fails on Azure Pipelines for it. I created GH-27161 to debug this specifically.

Screenshot 2021-07-15 at 14 27 11

@ambv
Copy link
Contributor Author

ambv commented Jul 15, 2021

Merging this since GH-27161 demonstrated that the Azure Pipelines-specific http_servers failure is not related to this PR. Also, reassuringly, GHA Windows passed fine.

@ambv ambv merged commit b83861f into python:main Jul 15, 2021
@bedevere-bot
Copy link

@ambv: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington
Copy link
Contributor

Thanks @ambv for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jul 15, 2021
@bedevere-bot
Copy link

GH-27162 is a backport of this pull request to the 3.10 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 15, 2021
…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>
ambv pushed a commit that referenced this pull request Jul 15, 2021
…rs (GH-27115) (GH-27162)

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):
```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 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)
ambv added a commit to ambv/cpython that referenced this pull request Jul 15, 2021
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