Py3k support -- files accidentaly reverted in previous commits