Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

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

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

bpo-40635: Fix getfqdn() docstring and docs#27971

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ambv merged 7 commits intopython:mainfromakulakov:40635-Fix-socket-getfqdn-docs
Aug 26, 2021

Conversation

@akulakov
Copy link
Contributor

@akulakovakulakov commentedAug 26, 2021
edited by bedevere-bot
Loading

@akulakovakulakov changed the titleFix getfqdn() docstring and docsbpo-40635: Fix getfqdn() docstring and docsAug 26, 2021
Copy link
Member

@Fidget-SpinnerFidget-Spinner left a comment

Choose a reason for hiding this comment

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

Thanks Andrei, this LGTM. But let's hear from a socket/networking expert first (and whether they want a news item).

akulakov reacted with thumbs up emoji
Comment on lines 810 to 812
host, if available. The first name which includes a period is selected.If FQDN is not
available and *name* is empty or is``'0.0.0.0'``,hostnamefrom:func:`gethostname` is
returned. Otherwise, *name*is returned unchanged.
Copy link
Contributor

Choose a reason for hiding this comment

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

Please don't exceed 79 characters per line.

Suggested change
host, if available. The first name which includes a period is selected. If FQDN is not
available and *name* is empty or is ``'0.0.0.0'``, hostname from:func:`gethostname` is
returned. Otherwise, *name* is returned unchanged.
host, if available. The first name which includes a period is selected. In
case no fully qualified domain name is available and *name* was provided,
it is returned unchanged. If *name* was empty or equal to ``'0.0.0.0'``,
the hostname as returned by:func:`gethostname` is returned.

Copy link
ContributorAuthor

@akulakovakulakovAug 26, 2021
edited
Loading

Choose a reason for hiding this comment

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

'as returned ... is returned' reads a bit awkward I think, is it okay if I use the same wording as in your suggestion for the docstring? ; which is:

[...] hostname from gethostname() is returned.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure, agreed. I just used what was originally in the doc but you're right that the docstring version is an improvement.

akulakov reacted with thumbs up emoji
@ambvambv merged commitfdcb675 intopython:mainAug 26, 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, 3.10.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull requestAug 26, 2021
Co-authored-by: Łukasz Langa <lukasz@langa.pl>(cherry picked from commitfdcb675)Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
@bedevere-bot
Copy link

GH-27977 is a backport of this pull request to the3.10 branch.

@bedevere-botbedevere-bot removed the needs backport to 3.10only security fixes labelAug 26, 2021
@bedevere-bot
Copy link

GH-27978 is a backport of this pull request to the3.9 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull requestAug 26, 2021
Co-authored-by: Łukasz Langa <lukasz@langa.pl>(cherry picked from commitfdcb675)Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
@akulakovakulakov deleted the 40635-Fix-socket-getfqdn-docs branchAugust 26, 2021 18:42
@akulakov
Copy link
ContributorAuthor

Thanks@ambv and@Fidget-Spinner for reviewing :)

miss-islington added a commit that referenced this pull requestAug 26, 2021
Co-authored-by: Łukasz Langa <lukasz@langa.pl>(cherry picked from commitfdcb675)Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
miss-islington added a commit that referenced this pull requestAug 26, 2021
Co-authored-by: Łukasz Langa <lukasz@langa.pl>(cherry picked from commitfdcb675)Co-authored-by: andrei kulakov <andrei.avk@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@ambvambvambv left review comments

@Fidget-SpinnerFidget-SpinnerFidget-Spinner approved these changes

@tirantiranAwaiting requested review from tiran

Assignees

No one assigned

Labels

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@akulakov@miss-islington@bedevere-bot@ambv@Fidget-Spinner@the-knights-who-say-ni

[8]ページ先頭

©2009-2025 Movatter.jp