Improve compatibility with Python3.0 testsuite
4 files changed