Skip to content

bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff#10639

Merged
orsenthil merged 1 commit into
python:masterfrom
CuriousLearner:fix-24746
Jan 9, 2019
Merged

bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff#10639
orsenthil merged 1 commit into
python:masterfrom
CuriousLearner:fix-24746

Conversation

@CuriousLearner

@CuriousLearner CuriousLearner commented Nov 21, 2018 •
edited
Loading

Copy link
Copy Markdown
Member

@CuriousLearner

CuriousLearner commented Nov 28, 2018

Copy link
Copy Markdown
Member Author

Hello @bitdancer @tim-one

Can you please have a look at this patch?

orsenthil
orsenthil approved these changes Jan 9, 2019
View reviewed changes

@orsenthil orsenthil left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks good to me. I followed the patch, and discussion in https://bugs.python.org/issue24746

@orsenthil orsenthil merged commit cbb1645 into python:master Jan 9, 2019
@miss-islington

miss-islington commented Jan 9, 2019

Copy link
Copy Markdown
Contributor

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

@bedevere-bot

bedevere-bot commented Jan 9, 2019

Copy link
Copy Markdown

@orsenthil: Please replace # with GH- in the commit message next time. Thanks!

@orsenthil

orsenthil commented Jan 9, 2019

Copy link
Copy Markdown
Member

Thank you, @CuriousLearner !

@bedevere-bot

bedevere-bot commented Jan 9, 2019

Copy link
Copy Markdown

GH-11476 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 Jan 9, 2019
@CuriousLearner @miss-islington
bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (p…
ce72713 
…ythonGH-10639)

(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@bedevere-bot

bedevere-bot commented Jan 9, 2019

Copy link
Copy Markdown

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

@miss-islington

miss-islington commented Jan 9, 2019

Copy link
Copy Markdown
Contributor

Sorry, @CuriousLearner and @orsenthil, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker cbb16459934eaf29c7c7d362939cd05550b2f21f 2.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 9, 2019
@CuriousLearner @miss-islington
bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (p…
9c35426 
…ythonGH-10639)

(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Jan 9, 2019
@miss-islington @CuriousLearner
bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (G…
53cf5f0 
…H-10639)

(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
orsenthil pushed a commit that referenced this pull request Jan 9, 2019
@miss-islington @CuriousLearner @orsenthil
bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (G…
5d9ae8b 
…H-10639) (#11477)

(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@orsenthil

orsenthil commented Jan 9, 2019

Copy link
Copy Markdown
Member

@CuriousLearner - Will you be willing to create the backport? If you get to it before me, please ping me on that PR.

@CuriousLearner

CuriousLearner commented Jan 9, 2019

Copy link
Copy Markdown
Member Author

Hey @orsenthil

Yes, I'm on it.

I started with cherry_picker cbb16459934eaf29c7c7d362939cd05550b2f21f 2.7
resolved the conflict, committed it, and now on the final step cherry_picker --continue, but it is taking really long, and it seems like it hung up.

I'll keep you posted!

If the last cherry_picker --continue succeeds, I'll tag you in another PR.

CuriousLearner added a commit to CuriousLearner/cpython that referenced this pull request Jan 9, 2019
@CuriousLearner
[2.7] bpo-24746: Avoid stripping trailing whitespace in doctest fancy…
fa61282 
… diff (pythonGH-10639).

(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@CuriousLearner CuriousLearner mentioned this pull request Jan 9, 2019
Merged
orsenthil pushed a commit that referenced this pull request Jan 9, 2019
@CuriousLearner @orsenthil
[2.7] bpo-24746: Avoid stripping trailing whitespace in doctest fancy…
02e33d9 
… diff (#11482)

* bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff

* [2.7] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639).
(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
This was referenced Jan 10, 2019
Closed
Closed
Closed
orsenthil added a commit that referenced this pull request Jan 10, 2019
@orsenthil
Revert "bpo-24746: Avoid stripping trailing whitespace in doctest fan…
786a66d 
…cy diff (GH-10639) (#11477)"

This reverts commit 5d9ae8b.
ned-deily pushed a commit that referenced this pull request Jan 10, 2019
@orsenthil @ned-deily
Revert "bpo-24746: Avoid stripping trailing whitespace in doctest fan…
d09e8ce 
…cy diff (GH-10639) (GH-11477)" (GH-11509)

This reverts commit 5d9ae8b which was merged to 3.6 in error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@orsenthil orsenthil orsenthil approved these changes

Assignees

@orsenthil orsenthil

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@CuriousLearner @miss-islington @bedevere-bot @orsenthil @the-knights-who-say-ni