merge r66932 and add a few py3k only checks
3 files changed