Code changes for single-file python 2 and 3 compatibility.