Commit to simplify the backport to python 2.7 and to make the code more consistent.
Attach a file by drag & drop or click to upload
