Skip to content

[3.6] bpo-24746: Avoid stripping trailing whitespace in doctest fancy diff (GH-10639) #11477

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
Jan 9, 2019

Conversation

miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jan 9, 2019

(cherry picked from commit cbb1645)

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

https://bugs.python.org/issue24746

…ythonGH-10639)

(cherry picked from commit cbb1645)

Co-authored-by: Sanyam Khurana <8039608+CuriousLearner@users.noreply.github.com>
@miss-islington
Copy link
Contributor Author

@CuriousLearner and @orsenthil: Status check is done, and it's a success ✅ .

@miss-islington
Copy link
Contributor Author

Sorry, I can't merge this PR. Reason: You're not authorized to push to this branch. Visit https://help.github.com/articles/about-protected-branches/ for more information..

@orsenthil orsenthil merged commit 5d9ae8b into python:3.6 Jan 9, 2019
@bedevere-bot
Copy link

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

@miss-islington miss-islington deleted the backport-cbb1645-3.6 branch January 9, 2019 14:46
@tirkarthi
Copy link
Member

Sorry that it's off topic but I am just curious if 3.6 accepts bug fixes since it has moved into security fix only mode.

@vstinner
Copy link
Member

Please don't merge bugfixes in the 3.6: it's now in security-only mode... Moreover, this change caused a regression :-( https://bugs.python.org/issue24746#msg333367

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants