#7092: silence some more py3k warnings.
9 files changed