Skip to content

[2.7] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff#11482

Merged
orsenthil merged 2 commits into
python:2.7from
CuriousLearner:backport-cbb1645-2.7
Jan 9, 2019
Merged

[2.7] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff#11482
orsenthil merged 2 commits into
python:2.7from
CuriousLearner:backport-cbb1645-2.7

Conversation

@CuriousLearner

@CuriousLearner CuriousLearner commented Jan 9, 2019 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

CuriousLearner and others added 2 commits January 9, 2019 23:46
@CuriousLearner
bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff
85adb53
@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 commented Jan 9, 2019

Copy link
Copy Markdown
Member Author

Hi @orsenthil

Can you please have a look at this one?

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.

LGTM.

@orsenthil
orsenthil merged commit 02e33d9 into python:2.7 Jan 9, 2019
@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

Thanks again, @CuriousLearner !

@CuriousLearner

CuriousLearner commented Jan 9, 2019

Copy link
Copy Markdown
Member Author

Thanks to you @orsenthil :)

I was waiting for my PRs to be reviewed for so long.

Many thanks! 🌮

orsenthil added a commit that referenced this pull request Jan 10, 2019
@orsenthil
Revert "[2.7] bpo-24746: Avoid stripping trailing whitespace in docte…
882aba4 
…st fancy diff (#11482)"

This reverts commit 02e33d9.
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

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

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