remove six as a dependency in favour of modifying the few places where py2/py3 compat is neede.