gh-107155: Fix `help(lambda_func)` when `lambda_func` has `__annotati… by Eclips4 · Pull Request #107401 · python/cpython

Eclips4 · 2023-07-28T19:34:12Z

...ons__`

I cannot find any example with parenthesis in signature of lambda 😄 .

Issue: help() output of lambda with manually set __annotations__ is one char off #107155

…notations__` with `return` key.

Lib/pydoc.py

…ring

Eclips4 · 2023-07-31T18:36:56Z

Thanks for your help @AA-Turner !

Is there anything else that needs to be done? Also, I think this kind of PR doesn't need a NEWS entry.

AlexWaygood · 2023-07-31T20:18:12Z

Also, I think this kind of PR doesn't need a NEWS entry.

Here's how to think about whether a bugfix PR deserves a news entry: does the PR fix a bug that users have noticed? If so, users deserve to know about it being fixed, so it should have a news entry. If not, the PR should be closed, as users won't notice the change being made, which makes the PR have very limited value.

In this case, a user reported the bug on the GitHub issue tracker, so at least one user will notice the change. As such, it definitely deserves a news entry :)

AA-Turner · 2023-07-31T21:05:48Z

I'd agree with Alex, this is visible to end-users (although very rare!). Something that outlines that help and pydoc now correctly display lambdas with return annotations would be enough.

A

Misc/NEWS.d/next/Library/2023-08-02-01-17-32.gh-issue-107155.Mj1K9L.rst

Eclips4 · 2023-08-01T22:43:13Z

After your words, I agree that this PR needs a NEWS entry, thanks for thoroughly explanation!

I wrote some lines, please, check it.

…j1K9L.rst Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

AA-Turner

Thanks!

A

Misc/NEWS.d/next/Library/2023-08-02-01-17-32.gh-issue-107155.Mj1K9L.rst

Eclips4 · 2024-01-01T18:14:43Z

Now I'm have resolved the merge conflict.

Lib/pydoc.py

serhiy-storchaka

I do not like modification of the original object. It is not thread-safe. It does not work if __annotations__ is read-only. It does not restore {'return': None}.

Maybe just keep the parentheses if the lambda object has annotations? In any case this is not a valid Python syntax.

Lib/pydoc.py

Eclips4 · 2024-02-17T12:00:19Z

I do not like modification of the original object. It is not thread-safe. It does not work if __annotations__ is read-only. It does not restore {'return': None}.

Maybe just keep the parentheses if the lambda object has annotations? In any case this is not a valid Python syntax.

All of your points makes sense to me, thanks for them! I've made changes, please take a look at them :)
Altough, there's one question: now for lambdas without any params but with __annotations__ = {"return": int} help looks like that:

Help on function <lambda> in module __main__:

<lambda> lambda () -> int

Is it okay or we should change it?

serhiy-storchaka · 2024-02-17T12:05:49Z

lambda with annotations can't be expressed in Python syntax anyway. At least it now has balanced parentheses and does not truncate words.

Lib/test/test_pydoc/test_pydoc.py

miss-islington-app · 2024-02-17T12:47:54Z

Thanks @Eclips4 for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington-app · 2024-02-17T12:47:58Z

Sorry, @Eclips4 and @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker b9a9e3dd62326b726ad2e8e8efd87ca6327b4019 3.12

miss-islington-app · 2024-02-17T12:48:15Z

Sorry, @Eclips4 and @serhiy-storchaka, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker b9a9e3dd62326b726ad2e8e8efd87ca6327b4019 3.11

bedevere-app · 2024-02-17T14:25:56Z

GH-115612 is a backport of this pull request to the 3.12 branch.

…notation (pythonGH-107401) (cherry picked from commit b9a9e3d) Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>

bedevere-app · 2024-02-17T14:36:33Z

GH-115613 is a backport of this pull request to the 3.11 branch.

pythonGH-107401)

pythongh-107155: Fix help(lambda_func) when lambda_func has `__an…

d0d69c2

…notations__` with `return` key.

bedevere-bot mentioned this pull request Jul 28, 2023

help() output of lambda with manually set __annotations__ is one char off #107155

Closed

bedevere-bot added the awaiting review label Jul 28, 2023

AA-Turner reviewed Jul 30, 2023

View reviewed changes

Lib/pydoc.py Outdated Show resolved Hide resolved

AA-Turner added 2 commits July 31, 2023 16:51

Manipulate lambda annotations before converting the signature to a st…

5a2133b

…ring

Add a simple test

7802354

Add NEWS entry

0deb7ac

AlexWaygood reviewed Aug 1, 2023

View reviewed changes

Misc/NEWS.d/next/Library/2023-08-02-01-17-32.gh-issue-107155.Mj1K9L.rst Outdated Show resolved Hide resolved

Update Misc/NEWS.d/next/Library/2023-08-02-01-17-32.gh-issue-107155.M…

6f5b10a

…j1K9L.rst Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>

AA-Turner approved these changes Aug 6, 2023

View reviewed changes

bedevere-bot added awaiting core review and removed awaiting review labels Aug 6, 2023

Merge branch 'main' into issue-107155

70acb18

Eclips4 commented Jan 1, 2024

View reviewed changes

Misc/NEWS.d/next/Library/2023-08-02-01-17-32.gh-issue-107155.Mj1K9L.rst Outdated Show resolved Hide resolved

Add a newline

52f6c5c

Eclips4 requested review from AA-Turner, AlexWaygood and serhiy-storchaka January 1, 2024 18:14

Eclips4 commented Jan 1, 2024

View reviewed changes

Lib/pydoc.py Outdated Show resolved Hide resolved

serhiy-storchaka reviewed Jan 7, 2024

View reviewed changes

Eclips4 added 3 commits February 17, 2024 13:46

Remove parenthesis only if object doesn't have annotations

e5cf953

Merge branch 'main' into issue-107155

d505078

Add test case

4d0e5f6

Eclips4 commented Feb 17, 2024

View reviewed changes

Lib/pydoc.py Show resolved Hide resolved

Eclips4 requested a review from serhiy-storchaka February 17, 2024 11:54

Fix test

c0ce394

serhiy-storchaka reviewed Feb 17, 2024

View reviewed changes

Lib/test/test_pydoc/test_pydoc.py Outdated Show resolved Hide resolved

Add more test cases

63fe692

serhiy-storchaka approved these changes Feb 17, 2024

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting core review labels Feb 17, 2024

serhiy-storchaka enabled auto-merge (squash) February 17, 2024 12:46

serhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 only security fixes labels Feb 17, 2024

serhiy-storchaka merged commit b9a9e3d into python:main Feb 17, 2024

bedevere-app bot removed the awaiting merge label Feb 17, 2024

miss-islington-app bot assigned serhiy-storchaka Feb 17, 2024

Eclips4 mentioned this pull request Feb 17, 2024

[3.12] gh-107155: Fix help() for lambda function with return annotati… #115612

Merged

bedevere-app bot removed the needs backport to 3.12 only security fixes label Feb 17, 2024

Eclips4 mentioned this pull request Feb 17, 2024

[3.11] gh-107155: Fix help() for lambda function with return annotati… #115613

Merged

bedevere-app bot removed the needs backport to 3.11 only security fixes label Feb 17, 2024

Eclips4 deleted the issue-107155 branch February 17, 2024 14:36

woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024

pythongh-107155: Fix help() for lambda function with return annotation (

cdd5ee9

pythonGH-107401)

diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024

pythongh-107155: Fix help() for lambda function with return annotation (

4561a2c

pythonGH-107401)

LukasWoodtli pushed a commit to LukasWoodtli/cpython that referenced this pull request Jan 22, 2025

pythongh-107155: Fix help() for lambda function with return annotation (

cc7b57e

pythonGH-107401)

Uh oh!

Conversation

Eclips4 commented Jul 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Eclips4 commented Jul 31, 2023

Uh oh!

AlexWaygood commented Jul 31, 2023

Uh oh!

AA-Turner commented Jul 31, 2023

Uh oh!

Uh oh!

Eclips4 commented Aug 1, 2023

Uh oh!

AA-Turner left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Eclips4 commented Jan 1, 2024

Uh oh!

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Eclips4 commented Feb 17, 2024

Uh oh!

serhiy-storchaka commented Feb 17, 2024

Uh oh!

Uh oh!

miss-islington-app bot commented Feb 17, 2024

Uh oh!

miss-islington-app bot commented Feb 17, 2024

Uh oh!

miss-islington-app bot commented Feb 17, 2024

Uh oh!

bedevere-app bot commented Feb 17, 2024

Uh oh!

bedevere-app bot commented Feb 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Eclips4 commented Jul 28, 2023 •

edited

Loading