WIP: Common Python 2 / 3 code base without 2to3

Do not merge ... this is work in progress.