Skip to content

bpo-22377: Fixes documentation for %Z in datetime#16507

Merged
miss-islington merged 5 commits intopython:masterfrom
karlcow:issue22377
Nov 26, 2019
Merged

bpo-22377: Fixes documentation for %Z in datetime#16507
miss-islington merged 5 commits intopython:masterfrom
karlcow:issue22377

Conversation

@karlcow
Copy link
Copy Markdown
Contributor

@karlcow karlcow commented Oct 1, 2019 •
edited by miss-islington
Loading

This fixes the issue discussed in https://bugs.python.org/issue22377
and fixes it according to the comments made by Paul Ganssle @pganssle

  • It clarifies which values are acceptable in the table
  • It extends the note with a clearer information on the valid values

https://bugs.python.org/issue22377

Automerge-Triggered-By: @pganssle

@the-knights-who-say-ni
Copy link
Copy Markdown

the-knights-who-say-ni commented Oct 1, 2019

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@karlcow

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@bedevere-bot bedevere-bot added docs Documentation in the Doc dir awaiting review labels Oct 1, 2019
pganssle
pganssle requested changes Oct 1, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@pganssle pganssle left a comment

Choose a reason for hiding this comment

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

Overall this looks great, thanks @karlcow!

I just have two minor nits.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 1, 2019

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@karlcow
Copy link
Copy Markdown
Contributor Author

karlcow commented Oct 1, 2019

I have made the requested changes; please review again

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 1, 2019

Thanks for making the requested changes!

@pganssle: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from pganssle October 1, 2019 22:37
pganssle
pganssle reviewed Oct 3, 2019
View reviewed changes
@karlcow
Copy link
Copy Markdown
Contributor Author

karlcow commented Oct 4, 2019

@pganssle

  1. I introduced your comments
  2. Change a bit the order and the shape of the notes so it is less confusing.
  3. rebase it so that it will fit in one commit.
  4. force pushed.

Do not hesitate to tell me if there is something else I can do.

@karlcow karlcow requested a review from pganssle October 4, 2019 07:40
@pganssle
Copy link
Copy Markdown
Member

pganssle commented Oct 4, 2019

@karlcow You don't have to worry too much about squashing your commits down, the branch protection rules force us to do squash merges, and we can always squash at the end.

@karlcow
Copy link
Copy Markdown
Contributor Author

karlcow commented Oct 4, 2019 •
edited
Loading

@pganssle ok. Everything is set. Ready to merge if no more comments. Hands off.
Thanks a lot for the help and the review.

@karlcow
Copy link
Copy Markdown
Contributor Author

karlcow commented Oct 9, 2019

I have made the requested changes; please review again

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Oct 9, 2019

Thanks for making the requested changes!

@pganssle: please review the changes made to this pull request.

karlcow and others added 2 commits November 4, 2019 17:29
@karlcow @pganssle
bpo-22377: Adds ValueError information for %Z in datetime
82890ac
@pganssle
Minor tweaks to %Z documentation.
9bd9242 
- Made the more unusual value more prominent.
- Made a clearer separation between the `strptime` and `strftime` parts.
pganssle
pganssle approved these changes Nov 4, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@pganssle pganssle left a comment

Choose a reason for hiding this comment

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

I am so sorry it's taken me so long to swing back around to this @karlcow.

I made some minor tweaks here and everything looks good. Please take a look at my changes and let me know if you agree with my changes. If so, I'm happy to merge.

(By the way, I did a force-push because I rebased against master, if you need to make more changes, please do a force-pull or something equivalent first).

@karlcow
Copy link
Copy Markdown
Contributor Author

karlcow commented Nov 6, 2019

I am so sorry it's taken me so long to swing back around to this @karlcow.

I made some minor tweaks here and everything looks good. Please take a look at my changes and let me know if you agree with my changes. If so, I'm happy to merge.

Let's go with it!
Thanks.

@miss-islington miss-islington merged commit bc441ed into python:master Nov 26, 2019
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Nov 26, 2019

Thanks @karlcow for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Nov 26, 2019

I'm having trouble backporting to 3.8. Reason: 'Error 110 while writing to socket. Connection timed out.'. Please retry by removing and re-adding the needs backport to 3.8 label.

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Nov 26, 2019

Sorry, @karlcow, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker bc441ed7c1449f06df37905ee6289aa93b85d4cb 3.7

@miss-islington miss-islington self-assigned this Nov 26, 2019
jacobneiltaylor pushed a commit to jacobneiltaylor/cpython that referenced this pull request Dec 5, 2019
@karlcow
bpo-22377: Fixes documentation for %Z in datetime (pythonGH-16507)
57172ed 
This fixes the issue discussed in https://bugs.python.org/issue22377
and fixes it according to the comments made by Paul Ganssle @pganssle

* It clarifies which values are acceptable in the table
* It extends the note with a clearer information on the valid values


https://bugs.python.org/issue22377
shihai1991 pushed a commit to shihai1991/cpython that referenced this pull request Jan 31, 2020
@karlcow @shihai1991
bpo-22377: Fixes documentation for %Z in datetime (pythonGH-16507)
660f510 
This fixes the issue discussed in https://bugs.python.org/issue22377
and fixes it according to the comments made by Paul Ganssle @pganssle

* It clarifies which values are acceptable in the table
* It extends the note with a clearer information on the valid values


https://bugs.python.org/issue22377
@cool-RR cool-RR mannequin mentioned this pull request Apr 24, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pganssle pganssle pganssle approved these changes

@abalkin abalkin Awaiting requested review from abalkin

Assignees

@miss-islington miss-islington

Labels

docs Documentation in the Doc dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@karlcow @the-knights-who-say-ni @bedevere-bot @pganssle @miss-islington