Skip to content

controlflow: Use full example for "5 through 9" #5907

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

Merged
merged 1 commit into from
Mar 9, 2018

Conversation

Stevoisiak
Copy link
Contributor

Minor wording change to replace example output "5 through 9" with "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.

Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA (this might be simply due to a missing "GitHub Name" entry in your b.p.o account settings). This is necessary for legal reasons before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@Stevoisiak
Copy link
Contributor Author

@the-knights-who-say-ni Acknowledged. I have now filled out and signed the contributor agreement.

@miss-islington
Copy link
Contributor

Thanks @Stevoisiak for the PR, and @Mariatta for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@Mariatta
Copy link
Member

Mariatta commented Mar 9, 2018

Thanks @Stevoisiak and congrats on your first contribution to CPython 🌮

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 9, 2018
Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
(cherry picked from commit 83d7062)

Co-authored-by: Steven M. Vascellaro <[email protected]>
@bedevere-bot
Copy link

GH-6039 is a backport of this pull request to the 3.7 branch.

@miss-islington
Copy link
Contributor

Sorry, @Stevoisiak and @Mariatta, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 83d7062d2dc5eacfef578e072bca4747c346fdae 2.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 9, 2018
Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
(cherry picked from commit 83d7062)

Co-authored-by: Steven M. Vascellaro <[email protected]>
@bedevere-bot
Copy link

GH-6040 is a backport of this pull request to the 3.6 branch.

miss-islington added a commit that referenced this pull request Mar 9, 2018
Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
(cherry picked from commit 83d7062)

Co-authored-by: Steven M. Vascellaro <[email protected]>
@miss-islington
Copy link
Contributor

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

@bedevere-bot
Copy link

GH-6066 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 10, 2018
Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
(cherry picked from commit 83d7062)

Co-authored-by: Steven M. Vascellaro <[email protected]>
miss-islington added a commit that referenced this pull request Mar 10, 2018
Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
(cherry picked from commit 83d7062)

Co-authored-by: Steven M. Vascellaro <[email protected]>
jo2y pushed a commit to jo2y/cpython that referenced this pull request Mar 23, 2018
Replace example result of "5 through 9" with complete list: "5, 6, 7, 8, 9".
This format is more consistent with the surrounding examples.
@serhiy-storchaka
Copy link
Member

Do you mind to create a backport to 2.7 @Stevoisiak?

@Stevoisiak
Copy link
Contributor Author

@serhiy-storchaka How would I go about creating a backport? Would I just recreate the commit for the 2.7 branch?

@serhiy-storchaka
Copy link
Member

Yes, just recreate the commit for the 2.7 branch. You can manually create a new branch from 2.7, git cherry-pick changes to it, and create a PR to 2.7. The cherry_picker tool will do these steps for your automatically, you will need just to fix conflicts.

@Stevoisiak
Copy link
Contributor Author

@serhiy-storchaka I'm having some issues with my Git client that prevent me from backporting this myself.

@Mariatta
Copy link
Member

The doc for 2.7 is correct, so we don't need to backport.
Here is how it looks like in 2.7 controlflow documentation:

>>> range(5, 10)
[5, 6, 7, 8, 9]

@Stevoisiak Stevoisiak deleted the controlflow-5-through-9 branch May 16, 2018 13:38
@Mariatta Mariatta removed their assignment Jun 10, 2018
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 issue skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants