Issue #22340: Fix Python 3 warnings in Python 2 tests
8 files changed