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 — gh-104659: Consolidate python examples in enum documentation by twmr · Pull Request #104665 · python/cpython

Conversation

@twmr

@twmr twmr commented May 19, 2023 •
edited by github-actions Bot
Loading

Uh oh!

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

Copy link
Copy Markdown
Contributor

The IntEnum example in the rst docs is the only example in which a plural classname (Numbers) is used. This change fixes it by renaming Numbers to Number.

Closes #104659

  • Issue: Plural vs Singular in enum documentation #104659

📚 Documentation preview 📚: https://cpython-previews--104665.org.readthedocs.build/

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@twmr
twmr requested a review from ethanfurman as a code owner May 19, 2023 16:52
@bedevere-bot bedevere-bot added the awaiting review label May 19, 2023
@bedevere-bot bedevere-bot mentioned this pull request May 19, 2023
Plural vs Singular in enum documentation #104659
Closed
@bedevere-bot bedevere-bot added docs Documentation in the Doc dir skip news labels May 19, 2023
@ghost

ghost commented May 19, 2023 •
edited by ghost
Loading

Uh oh!

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

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.
CLA signed
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@twmr twmr changed the title gh-104659: Consolidate python examples in enum documentaiton gh-104659: Consolidate python examples in enum documentation May 19, 2023
ethanfurman
ethanfurman approved these changes May 19, 2023
View reviewed changes
@bedevere-bot bedevere-bot added awaiting merge and removed awaiting review labels May 19, 2023
@twmr
Consolidate python examples in enum documentation
79ff9b2 
The IntEnum example in the rst docs is the only example in which a
plural classname (Numbers) is used. This change fixes it by renaming
Numbers to Number.

Closes python#104659
@twmr
twmr force-pushed the singular_enum branch 2 times, most recently from 90b8bb0 to 79ff9b2 Compare May 19, 2023 16:56
hugovk
hugovk approved these changes May 19, 2023
View reviewed changes
@hugovk hugovk added the needs backport to 3.11 only security fixes label May 19, 2023
@hugovk
hugovk merged commit 3ac856e into python:main May 19, 2023
@miss-islington

miss-islington commented May 19, 2023

Copy link
Copy Markdown
Contributor

Thanks @Thisch for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 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 awaiting merge label May 19, 2023
@miss-islington

miss-islington commented May 19, 2023

Copy link
Copy Markdown
Contributor

Sorry, @Thisch and @hugovk, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3ac856e69734491ff8423020c700c9ae86ac9a08 3.11
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@miss-islington miss-islington assigned hugovk May 19, 2023
@sunmy2019

sunmy2019 commented May 19, 2023

Copy link
Copy Markdown
Member

For small changes like this one, there is usually no need to force-push since they are squash merged.
For large changes, people sometimes use force-push to keep things up to date (to main).
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-bot

bedevere-bot commented May 19, 2023

Copy link
Copy Markdown

GH-104666 is a backport of this pull request to the 3.11 branch.
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.11 only security fixes label May 19, 2023
hugovk pushed a commit to hugovk/cpython that referenced this pull request May 19, 2023
@twmr @hugovk
pythongh-104659: Consolidate python examples in enum documentation (p…
cc7d2bf 
…ython#104665)

(cherry picked from commit 3ac856e)
@hugovk

hugovk commented May 19, 2023

Copy link
Copy Markdown
Member

We usually prefer to avoid force-pushing to big ones too, because it makes it harder to review.

Anyway, thanks for the issue and PR!
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
hugovk added a commit that referenced this pull request May 19, 2023
@hugovk @twmr
[3.11] gh-104659: Consolidate python examples in enum documentation (#…
cd13f73 
…104665) (#104666)

gh-104659: Consolidate python examples in enum documentation (#104665)

(cherry picked from commit 3ac856e)

Co-authored-by: Thomas Hisch <[email protected]>
carljm added a commit to gsallam/cpython_with_perfmap_apii that referenced this pull request May 20, 2023
@carljm
Merge branch 'main' into gsallam/main
ea5965a 
* main: (30 commits)
  pythongh-103987: fix several crashes in mmap module (python#103990)
  docs: fix wrong indentation causing rendering error in dis page (python#104661)
  pythongh-94906: Support multiple steps in math.nextafter (python#103881)
  pythongh-104472: Skip `test_subprocess.ProcessTestCase.test_empty_env` if ASAN is enabled (python#104667)
  pythongh-103839: Allow building Tkinter against Tcl 8.7 without external libtommath (pythonGH-103842)
  pythongh-85984: New additions and improvements to the tty library. (python#101832)
  pythongh-104659: Consolidate python examples in enum documentation (python#104665)
  pythongh-92248: Deprecate `type`, `choices`, `metavar` parameters of `argparse.BooleanOptionalAction` (python#103678)
  pythongh-104645: fix error handling in marshal tests (python#104646)
  pythongh-104600: Make type.__type_params__ writable (python#104634)
  pythongh-104602: Add additional test for listcomp with lambda (python#104639)
  pythongh-104640: Disallow walrus in comprehension within type scopes (python#104641)
  pythongh-103921: Rename "type" header in argparse docs (python#104654)
  Improve readability of `typing._ProtocolMeta.__instancecheck__` (python#104649)
  pythongh-96522: Fix deadlock in pty.spawn (python#96639)
  pythonGH-102818: Do not call `PyTraceBack_Here` in sys.settrace trampoline.  (pythonGH-104579)
  pythonGH-103545: Add macOS specific constants for ``os.setpriority`` to ``os`` (python#104606)
  pythongh-104623: Update macOS installer to SQLite 3.42.0 (pythonGH-104624)
  pythongh-104619: never leak comprehension locals to outer locals() (python#104637)
  pythongh-104602: ensure all cellvars are known up front (python#104603)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hugovk hugovk hugovk approved these changes
@ethanfurman ethanfurman ethanfurman approved these changes

Uh oh!

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

Assignees

@hugovk hugovk

Labels

docs Documentation in the Doc dir skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Plural vs Singular in enum documentation

Uh oh!

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

6 participants

@twmr @miss-islington @sunmy2019 @bedevere-bot @hugovk @ethanfurman
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.