Python 3 compatibility improvement