Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-45600: Enhanced / clarified the docs for os.environ and os.environb #29204

Merged
merged 4 commits into from Oct 29, 2021

Conversation

akulakov
Copy link
Contributor

@akulakov akulakov commented Oct 24, 2021

https://bugs.python.org/issue45600

Co-authored by Eryk Sun

A :term:`mapping` object representing the string environment. For example,
``environ['HOME']`` is the pathname of your home directory (on some platforms),
and is equivalent to ``getenv("HOME")`` in C.
A :term:`mapping` object of key and value strings that represent the process
Copy link
Contributor

Choose a reason for hiding this comment

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

This isn't valid English. You want to say "of string keys and values", or less tersely "where keys and values are strings" which I think reads better.

Comment on lines 212 to 213
Bytes version of :data:`environ`: a :term:`mapping` object of key and value
byte strings representing the process environment. :data:`environ` and
Copy link
Contributor

Choose a reason for hiding this comment

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

Similarly, here you can say "where both keys and values are :class:bytes objects" (we avoid saying "byte strings" now, there is only a few cases of this left in the entire documentation).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I like "keys and values are strings", updated.

Doc/library/os.rst Outdated Show resolved Hide resolved
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@ambv ambv merged commit b17cfd1 into python:main Oct 29, 2021
@ambv ambv added needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Oct 29, 2021
@miss-islington
Copy link
Contributor

Thanks @akulakov for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Thanks @akulakov for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 29, 2021
…nb (pythonGH-29204)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit b17cfd1)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 29, 2021
…nb (pythonGH-29204)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit b17cfd1)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
@bedevere-bot
Copy link

GH-29321 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Oct 29, 2021
@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Oct 29, 2021
ambv pushed a commit that referenced this pull request Oct 29, 2021
…nb (GH-29204) (GH-29322)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit b17cfd1)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
ambv pushed a commit that referenced this pull request Oct 29, 2021
…nb (GH-29204) (GH-29321)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit b17cfd1)

Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
@akulakov
Copy link
Contributor Author

@ambv thanks for reviewing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants