Remove Python 2.x-isms so that tests run under Python 1.5.2
Attach a file by drag & drop or click to upload