More Python 3 support.

--HG--
branch : trunk
9 files changed