ENH: Better py3k