forgot to commit py3k changes