Python 2.7 Compatibility changes