[#8375] better py2/3 unified_diff fix with a test
3 files changed