Minor Py3k modernization.
Automated merge for py3k testing