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.

Sign up for GitHub

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

Jump to bottom

bpo-30754 #14469

Merged
merged 6 commits into from
Jun 30, 2019
Merged

bpo-30754 #14469

merged 6 commits into from
Jun 30, 2019

Conversation

tmblweed
Copy link
Contributor

@tmblweed tmblweed commented Jun 29, 2019 •
edited by bedevere-bot
Loading

Added changes clarifying dedent behavior with regards to whitespace

https://bugs.python.org/issue30754

@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).

Our records indicate we have not received your CLA. For legal reasons we need you to sign this before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

If you have recently signed the CLA, please wait at least one business day
before our records are updated.

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

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

@gpshead gpshead added needs backport to 3.6 needs backport to 3.8 only security fixes skip news docs Documentation in the Doc dir labels Jun 30, 2019
@gpshead gpshead self-assigned this Jun 30, 2019
@gpshead
Remove an obsolete comment about pre-2.5 behavior.
37fbbd6 
Docstrings do not need to describe things from 15 years ago.  (I only noticed this due to the diff)
@tmblweed
Copy link
Contributor Author

@gpshead - this is my first commit to the repo - so do I need to do anything? I did sign the CLA a few hours ago, but not sure what your comment meant. Thanks!

@gpshead
Copy link
Member

gpshead commented Jun 30, 2019

Nope, nothing else to do for this PR on your end. This looks good, thanks!

It was being held up by some trialing whitespace in both files making it fail the continuous integration checks. I believe I've fixed those now.

In the future, look into configuring your editor(s) to always remove trailing whitespace from lines when saving files. A make patchcheck beforehand might have caught this before seeing it in the CI systems.

@tmblweed
Copy link
Contributor Author

sounds good, thanks for that!

@gpshead gpshead merged commit eb97b92 into python:master Jun 30, 2019
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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
Contributor

Sorry @tmblweed and @gpshead, I had trouble checking out the 3.7 backport branch.
Please backport using cherry_picker on command line.
cherry_picker eb97b9211e7c99841d6cae8c63893b3525d5a401 3.7

@bedevere-bot
Copy link

GH-14475 is a backport of this pull request to the 2.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 30, 2019
@tmblweed @miss-islington
bpo-30754: Document textwrap.dedent blank line behavior. (pythonGH-14469
36d5561 
)

* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
(cherry picked from commit eb97b92)

Co-authored-by: tmblweed <tmblweed@users.noreply.github.com>
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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

@bedevere-bot
Copy link

GH-14476 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 Jun 30, 2019
@tmblweed @miss-islington
bpo-30754: Document textwrap.dedent blank line behavior. (pythonGH-14469
59ec3a5 
)

* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
(cherry picked from commit eb97b92)

Co-authored-by: tmblweed <tmblweed@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 30, 2019
@tmblweed @miss-islington
bpo-30754: Document textwrap.dedent blank line behavior. (pythonGH-14469
854db35 
)

* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
(cherry picked from commit eb97b92)

Co-authored-by: tmblweed <tmblweed@users.noreply.github.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Jun 30, 2019
@bedevere-bot
Copy link

GH-14477 is a backport of this pull request to the 3.8 branch.

miss-islington added a commit that referenced this pull request Jun 30, 2019
@miss-islington @tmblweed
bpo-30754: Document textwrap.dedent blank line behavior. (GH-14469)
e2e41cd 
* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
(cherry picked from commit eb97b92)

Co-authored-by: tmblweed <tmblweed@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Jun 30, 2019
@miss-islington @tmblweed
bpo-30754: Document textwrap.dedent blank line behavior. (GH-14469)
3e133c4 
* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
(cherry picked from commit eb97b92)

Co-authored-by: tmblweed <tmblweed@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Jun 30, 2019
@miss-islington
[2.7] bpo-30754: Document textwrap.dedent blank line behavior. (GH-14469
bc60c47 
) (GH-14475)

* Added documentation for textwrap.dedent behavior.
(cherry picked from commit eb97b92)


Co-authored-by: tmblweed <tmblweed@users.noreply.github.com>


https://bugs.python.org/issue30754
lisroach pushed a commit to lisroach/cpython that referenced this pull request Sep 10, 2019
@tmblweed @lisroach
bpo-30754: Document textwrap.dedent blank line behavior. (pythonGH-14469
01055a5 
)

* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
DinoV pushed a commit to DinoV/cpython that referenced this pull request Jan 14, 2020
@tmblweed @DinoV
bpo-30754: Document textwrap.dedent blank line behavior. (pythonGH-14469
a2a47a7 
)

* Added documentation for textwrap.dedent behavior.
* Remove an obsolete note about pre-2.5 behavior from the docstring.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gpshead gpshead

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.
5 participants
@tmblweed @the-knights-who-say-ni @gpshead @miss-islington @bedevere-bot