Improve compatibility with Python3.0 testsuite
3 files changed