Py3k fix.
Automatic Py3k merge for testing