Changes by Brett Cannon: _____________________________________ Tracker <report at bugs.python.org> <http://bugs.python.org/issue1631171> _____________________________________