Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ambv merged 4 commits intopython:mainfromambv:bpo42073
Jul 15, 2021

Conversation

ambv
Copy link
Contributor

@ambvambv commentedJul 13, 2021
edited by bedevere-bot
Loading

Patch by Erik Welch.

bpo-19072 (#8405) allowsclassmethod 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):

classA:@myclassmethoddeff1(cls):returncls@classmethod@myclassmethoddeff2(cls):returncls

In Python 3.8 and before,A.f2() returnA. Currently in Python 3.9, it
returnstype(A). This PR makeA.f2() returnA again.

As of#8405, classmethod callsobj.__get__(type) ifobj 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 wantA, nottype(A)).

This PR updates classmethod to callobj.__get__(type, type) ifobj has
__get__.

Co-authored-by: Erik Welcherik.n.welch@gmail.com


Original patch was on the3.9 branch so I recreated it onmain. Passes-uall.

https://bugs.python.org/issue42073

@ambv
Copy link
ContributorAuthor

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

@ambv
Copy link
ContributorAuthor

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 ontest_httpservers. It passes on my end.

ambvand others added2 commitsJuly 15, 2021 11:11
Patch by Erik Welch.bpo-19072 (python#8405) allows `classmethod` to wrap other descriptors, but this doesnot work when the wrapped descriptor mimics classmethod.  The current PR fixesthis.In Python 3.8 and before, one could create a callable descriptor such that thisworks as expected (see Lib/test/test_decorators.py for examples):```pythonclass 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, itreturns `type(A)`.  This PR make `A.f2()` return `A` again.As ofpython#8405, classmethod calls `obj.__get__(type)` if `obj` 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 firstargument, 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
ContributorAuthor

ambv commentedJul 15, 2021
edited
Loading

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

Screenshot 2021-07-15 at 14 27 11

@ambv
Copy link
ContributorAuthor

Merging this sinceGH-27161 demonstrated that the Azure Pipelines-specifichttp_servers failure is not related to this PR. Also, reassuringly, GHA Windows passed fine.

@ambvambv merged commitb83861f intopython:mainJul 15, 2021
@bedevere-bot
Copy link

@ambv: Please replace# withGH- 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-botbedevere-bot removed the needs backport to 3.10only security fixes labelJul 15, 2021
@bedevere-bot
Copy link

GH-27162 is a backport of this pull request to the3.10 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull requestJul 15, 2021
…rs (pythonGH-27115)Patch by Erik Welch.bpo-19072 (pythonGH-8405) allows `classmethod` to wrap other descriptors, but this doesnot work when the wrapped descriptor mimics classmethod.  The current PR fixesthis.In Python 3.8 and before, one could create a callable descriptor such that thisworks as expected (see Lib/test/test_decorators.py for examples):```pythonclass 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, itreturns `type(A)`.  This PR make `A.f2()` return `A` again.As ofpythonGH-8405, classmethod calls `obj.__get__(type)` if `obj` 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 firstargument, 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 commitb83861f)Co-authored-by: Łukasz Langa <lukasz@langa.pl>
ambv pushed a commit that referenced this pull requestJul 15, 2021
…rs (GH-27115) (GH-27162)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 fixesthis.In Python 3.8 and before, one could create a callable descriptor such that thisworks as expected (see Lib/test/test_decorators.py for examples):```pythonclass 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, itreturns `type(A)`.  This PR make `A.f2()` return `A` again.As ofGH-8405, classmethod calls `obj.__get__(type)` if `obj` 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 firstargument, 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 commitb83861f)
ambv added a commit to ambv/cpython that referenced this pull requestJul 15, 2021
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

4 participants
@ambv@bedevere-bot@miss-islington@the-knights-who-say-ni

[8]ページ先頭

©2009-2025 Movatter.jp