Fix bug from d47565

six.u wasn't right, but nor was unicode(), since it doesn't exist in
Py3