test/crossrunner: merge in old Py2vs3 compat.py
4 files changed