port of r77391 to py3k, along with some additional tests and cleanup. Patch by Florent Xicluna.
Attach a file by drag & drop or click to upload
