fix up syntax enough to have the testsuite run on python3
add six to the requirements for now