Clean single-source support for Python 3 and 2
