Name and idiom changes to make local tests pass on Py3k
Adding six dependency