More manual changes towards Py3-compat identified by future. Still 2.7 compatible
Authored by: schliep 2020-12-17
Parent: [r824]
Child: [r826]