GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — bpo-42073: allow classmethod to wrap other classmethod-like descriptors by ambv · Pull Request #27115 · python/cpython

Conversation

@ambv

@ambv ambv commented Jul 13, 2021 •
edited by bedevere-bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor

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 [email protected]


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

https://bugs.python.org/issue42073

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@the-knights-who-say-ni the-knights-who-say-ni added the CLA signed label Jul 13, 2021
@bedevere-bot bedevere-bot added the awaiting core review label Jul 13, 2021
@ambv

ambv commented Jul 13, 2021

Copy link
Copy Markdown
Contributor Author

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.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@ambv

ambv commented Jul 14, 2021

Copy link
Copy Markdown
Contributor Author

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.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

ambv and others added 2 commits July 15, 2021 11:11
@ambv @eriknw
bpo-42073: allow classmethod to wrap other classmethod-like descriptors.
1ab4920
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 <[email protected]>
@ambv
Add blurb
b3dd8d3
@ambv
ambv force-pushed the bpo42073 branch from a0f1cd1 to b3dd8d3 Compare July 15, 2021 09:12
@ambv
Throw-away commit to check sanity of Azure Pipelines
a3a65a0
@ambv

ambv commented Jul 15, 2021 •
edited
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Contributor Author

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@ambv
Revert "Throw-away commit to check sanity of Azure Pipelines"
05e8247
This reverts commit a3a65a0.
@ambv

ambv commented Jul 15, 2021

Copy link
Copy Markdown
Contributor Author

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.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

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

bedevere-bot commented Jul 15, 2021

Copy link
Copy Markdown

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the awaiting core review label Jul 15, 2021
@ambv
ambv deleted the bpo42073 branch July 15, 2021 13:17
@sthagen sthagen mentioned this pull request Jul 15, 2021
bpo-42073: allow classmethod to wrap other classmethod-like descripto… sthagen/python-cpython#524
Merged
@ambv ambv added the needs backport to 3.10 label Jul 15, 2021
@miss-islington

miss-islington commented Jul 15, 2021

Copy link
Copy Markdown
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!

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 label Jul 15, 2021
@bedevere-bot

bedevere-bot commented Jul 15, 2021

Copy link
Copy Markdown

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

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 15, 2021
@ambv @miss-islington
bpo-42073: allow classmethod to wrap other classmethod-like descripto…
165e0d2
…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 <[email protected]>
(cherry picked from commit b83861f)

Co-authored-by: Łukasz Langa <[email protected]>
ambv pushed a commit that referenced this pull request Jul 15, 2021
@miss-islington @eriknw
bpo-42073: allow classmethod to wrap other classmethod-like descripto…
2ce8af3
…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 <[email protected]>
(cherry picked from commit b83861f)
ambv added a commit to ambv/cpython that referenced this pull request Jul 15, 2021
@ambv
[DO-NOT-MERGE] Debug Azure Pipelines Accept: (see pythonGH-27115)
18cd4c2
@ambv ambv mentioned this pull request Jul 15, 2021
bpo-44647: Fix test_httpservers failing on Unicode characters in os.environ on Windows #27161
Merged
@pablogsal pablogsal mentioned this pull request Jul 18, 2021
[3.10] Correct the order of regen-abidump #27228
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@ambv @bedevere-bot @miss-islington @the-knights-who-say-ni
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.