rectify last commit and support py3k