← 返回首页
gh-100556: Better `or` doc wording by ramvikrams · Pull Request #100589 · python/cpython · GitHub
Skip to content

Navigation Menu

Toggle navigation
Sign in
Appearance settings
Search or jump to...

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

Provide feedback

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

Include my email address so I can be contacted
Cancel Submit feedback

Saved searches

Use saved searches to filter your results more quickly

Cancel Create saved search
Appearance settings
Resetting focus

gh-100556: Better or doc wording#100589

Merged
erlend-aasland merged 5 commits into
python:mainfrom
ramvikrams:t00
Feb 21, 2023
Merged

gh-100556: Better or doc wording#100589
erlend-aasland merged 5 commits into
python:mainfrom
ramvikrams:t00

Conversation

ramvikrams commented Dec 28, 2022

Copy link
Copy Markdown
Contributor

gh-100556: changed the or documentation

bedevere-bot mentioned this pull request Dec 28, 2022
Closed
bedevere-bot added awaiting review docs Documentation in the Doc dir skip news labels Dec 28, 2022
AlexandroLuis suggested changes Dec 29, 2022
View reviewed changes

AlexandroLuis left a comment •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

i wonder how and works if there's no comparison
just
if x is false: x else: y
and not
if x is True and y is True: True else: False

ramvikrams commented Dec 29, 2022

Copy link
Copy Markdown
Contributor Author

i wonder how and works if there's no comparison
just
if x is false: x else: y
and not
if x is True and y is True: True else: False

Thanks will do the change

slateny reviewed Dec 30, 2022
View reviewed changes
Comment thread Doc/library/stdtypes.rst Outdated
| | *y* | |
+-------------+---------------------------------+-------+
| ``x and y`` | if *x* is True and *y* is True, | \(2) |
| | then True, else False | |

slateny Dec 30, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

I think you misunderstood the other comment, as this now doesn't cover something like

>>> [] and [1] []

ramvikrams Dec 30, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

could you please tell then how should it be framed, bcoz I am not able to think of it

AlexandroLuis Dec 30, 2022

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

if x and y, then True, else False

it covers if it's Null, empty, False...

ramvikrams Dec 30, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

thanks i'll do it

slateny Dec 31, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

The original mention of 'true'/'false' refers to all truthy and falsey values, which include 0, None, empty lists, etc., and saying True excludes those as True refers to just the boolean value. I also don't think that it's all that helpful for a table to have an entry to say x and y then its explanation also say x and y, so I would actually recommend just sticking with the original for this and section.

hugovk reviewed Dec 31, 2022
View reviewed changes
Comment thread Doc/library/stdtypes.rst Outdated Show resolved Hide resolved
Update Doc/library/stdtypes.rst …
83e83ed
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
CAM-Gerlach added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Feb 21, 2023
CAM-Gerlach approved these changes Feb 21, 2023
View reviewed changes

CAM-Gerlach left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality Hide comment

LGTM IMO; it avoids a double negative (if false, else) and the order follows more closely with that of the expression itself

erlend-aasland commented Feb 21, 2023

Copy link
Copy Markdown
Contributor

Thanks for the PR @ramvikrams

erlend-aasland merged commit b40dd71 into python:main Feb 21, 2023

miss-islington commented Feb 21, 2023

Copy link
Copy Markdown
Contributor

Thanks @ramvikrams for the PR, and @erlend-aasland for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 21, 2023
pythongh-100556: Improve clarity of or docs (pythonGH-100589) …
57ba8e6
(cherry picked from commit b40dd71) Co-authored-by: ram vikram singh <ramvikrams243@gmail.com> Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

bedevere-bot commented Feb 21, 2023

Copy link
Copy Markdown

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

bedevere-bot removed the needs backport to 3.11 only security fixes label Feb 21, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 21, 2023
pythongh-100556: Improve clarity of or docs (pythonGH-100589) …
4c9a446
(cherry picked from commit b40dd71) Co-authored-by: ram vikram singh <ramvikrams243@gmail.com> Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

bedevere-bot commented Feb 21, 2023

Copy link
Copy Markdown

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

bedevere-bot removed the needs backport to 3.10 only security fixes label Feb 21, 2023
miss-islington added a commit that referenced this pull request Feb 21, 2023
gh-100556: Improve clarity of or docs (GH-100589) …
444ec74
(cherry picked from commit b40dd71) Co-authored-by: ram vikram singh <ramvikrams243@gmail.com> Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Feb 21, 2023
gh-100556: Improve clarity of or docs (GH-100589) …
a94f3ad
(cherry picked from commit b40dd71) Co-authored-by: ram vikram singh <ramvikrams243@gmail.com> Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
CAM-Gerlach changed the title gh-100556: Better or doc working gh-100556: Better or doc wording Feb 22, 2023

CAM-Gerlach commented Feb 22, 2023

Copy link
Copy Markdown
Member

Oops, forgot to fix the title...hope you fixed it in the commit message :)

erlend-aasland commented Feb 22, 2023

Copy link
Copy Markdown
Contributor

Oops, forgot to fix the title...hope you fixed it in the commit message :)

I did... hope you like it 😄 b40dd71
I'll do better next time!

carljm added a commit to carljm/cpython that referenced this pull request Feb 23, 2023
Merge branch 'main' into lockfreecp …
b257a16
* main: (76 commits) Fix syntax error in struct doc example (python#102160) pythongh-99108: Import MD5 and SHA1 from HACL* (python#102089) pythonGH-101777: `queue.rst`: use 2 spaces after a period to be consistent. (python#102143) Few coverage nitpicks for the cmath module (python#102067) pythonGH-100982: Restrict `FOR_ITER_RANGE` to a single instruction to allow instrumentation. (pythonGH-101985) pythongh-102135: Update turtle docs to rename wikipedia demo to rosette (python#102137) pythongh-99942: python.pc on android/cygwin should link to libpython per configure.ac (pythonGH-100356) pythongh-95672 fix typo SkitTest to SkipTest (pythongh-102119) pythongh-101936: Update the default value of fp from io.StringIO to io.BytesIO (pythongh-102100) pythongh-102008: simplify test_except_star by using sys.exception() instead of sys.exc_info() (python#102009) pythongh-101903: Remove obsolete undefs for previously removed macros Py_EnterRecursiveCall and Py_LeaveRecursiveCall (python#101923) pythongh-100556: Improve clarity of `or` docs (python#100589) pythongh-101777: Make `PriorityQueue` docs slightly clearer (python#102026) pythongh-101965: Fix usage of Py_EnterRecursiveCall return value in _bisectmodule.c (pythonGH-101966) pythongh-101578: Amend exception docs (python#102057) pythongh-101961 fileinput.hookcompressed should not set the encoding value for the binary mode (pythongh-102068) pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078) pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012) pythongh-101566: Sync with zipp 3.14. (pythonGH-102018) pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589) ...

CAM-Gerlach commented Feb 23, 2023

Copy link
Copy Markdown
Member

Oh, that's fine then of course :) At least for me updating the title-generated commit message updates the PR title as well, but it seems that's actually GitHub Refined rather than a builtin feature (I never know these days, heh)

python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
pythongh-100556: Improve clarity of or docs (python#100589) …
9fb4ef8
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
python-sidebar pushed a commit to python-sidebar/Python-Documentation-Fork-With-TOC that referenced this pull request Sep 1, 2024
pythongh-100556: Improve clarity of or docs (python#100589) …
75260af
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Sep 10, 2024
pythongh-100556: Improve clarity of or docs (python#100589) …
3d5a88e
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

hugovk hugovk left review comments
slateny slateny left review comments
erlend-aasland erlend-aasland approved these changes
CAM-Gerlach CAM-Gerlach approved these changes
+1 more reviewer
AlexandroLuis AlexandroLuis requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

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.

8 participants

Footer

© 2026 GitHub, Inc.