Get stuff working on py3k for real
5 files changed