This is in preparation for adding py3 support. Review-Url: https://codereview.chromium.org/2073823002
Attach a file by drag & drop or click to upload
