Revert "Minor Py3k modernization."

This reverts commit 1439c510a8b8e58b3cad9a0a902be49e38aa0928.
Automated merge for py3k testing