Clean up uses of some deprecated features.
Reported by Neal Norwitz on python-dev.
3 files changed