Apply [ 3365041 ] to fix py3k unittest regressions.