Update for py3k.