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

[orsenthil]

Reverts #11477

3.6 is in security fixes only mode and the patch merge was a mistake.

https://bugs.python.org/issue24746

[vstinner]

The commit message is confusing. I read it as the fix, whereas it's a revert.

[vstinner]

LGTM.

@ned-deily would you mind to merge this change?

[orsenthil]

@vstinner : I changed the title. I just need to "[3.6]" to satisfy the the status check, but I removed the "Revert" and it caused some confusion.

Should we wait for @ned-deily or shall we merge this once the CI goes green? I seem to have the privs to merge this PR.

[vstinner]

Should we wait for @ned-deily or shall we merge this once the CI goes green? I seem to have the privs to merge this PR.

I'm not allowed to merge PRs in the 3.6 branch, the branch is restricted to release managers like @ned-deily.

[ned-deily]

Thanks all for catching and fixing this. I don't understand how you were able to merge the original PR to 3.6 in the first place unless the branch protection settings had been inadvertently changed and subsequently reset. This is one reason why we want to minimize the number of people with repo administrative privileges.