WIP: Use Python 2 /3 compatible source (no 2to3)

This is work in progress ... please do not merge.