From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH 4/4] tools/ocaml: make python scripts 2 and 3 compatible Date: Mon, 1 Apr 2019 11:32:38 +0100 Message-ID: <20190401103238.15649-5-wei.liu2@citrix.com> References: <20190401103238.15649-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hAuFN-0008Ky-66 for xen-devel@lists.xenproject.org; Mon, 01 Apr 2019 10:32:57 +0000 In-Reply-To: <20190401103238.15649-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Ian Jackson , David Scott , Wei Liu , Christian Lindig , m.a.young@durham.ac.uk List-Id: xen-devel@lists.xenproject.org MS4gRXhwbGljaXRseSBpbXBvcnQgcmVkdWNlIGJlY2F1c2UgdGhhdCdzIHJlcXVpcmVkIGluIDMu CjIuIENoYW5nZSBwcmludCB0byBmdW5jdGlvbi4KMy4gRWxpbWluYXRlIGludm9jYXRpb25zIG9m IGhhc19rZXkuCgpTaWduZWQtb2ZmLWJ5OiBNIEEgWW91bmcgPG0uYS55b3VuZ0BkdXJoYW0uYWMu dWs+ClNpZ25lZC1vZmYtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQogdG9v bHMvb2NhbWwvbGlicy94ZW50b29sbG9nL2dlbmxldmVscy5weSB8ICA1ICsrKystCiB0b29scy9v Y2FtbC9saWJzL3hsL2dlbndyYXAucHkgICAgICAgICAgIHwgMTcgKysrKysrKysrKy0tLS0tLS0K IDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS90b29scy9vY2FtbC9saWJzL3hlbnRvb2xsb2cvZ2VubGV2ZWxzLnB5IGIvdG9vbHMv b2NhbWwvbGlicy94ZW50b29sbG9nL2dlbmxldmVscy5weQppbmRleCA4YzIzM2M1OWIxLi5mOWNm ODUzZTI2IDEwMDc1NQotLS0gYS90b29scy9vY2FtbC9saWJzL3hlbnRvb2xsb2cvZ2VubGV2ZWxz LnB5CisrKyBiL3Rvb2xzL29jYW1sL2xpYnMveGVudG9vbGxvZy9nZW5sZXZlbHMucHkKQEAgLTEs NiArMSw5IEBACiAjIS91c3IvYmluL3B5dGhvbgogCitmcm9tIF9fZnV0dXJlX18gaW1wb3J0IHBy aW50X2Z1bmN0aW9uCisKIGltcG9ydCBzeXMKK2Zyb20gZnVuY3Rvb2xzIGltcG9ydCByZWR1Y2UK IAogZGVmIHJlYWRfbGV2ZWxzKCk6CiAJZiA9IG9wZW4oJy4uLy4uLy4uL2xpYnMvdG9vbGxvZy9p bmNsdWRlL3hlbnRvb2xsb2cuaCcsICdyJykKQEAgLTkzLDcgKzk2LDcgQEAgZGVmIGF1dG9nZW5f aGVhZGVyKG9wZW5fY29tbWVudCwgY2xvc2VfY29tbWVudCk6CiAKIGlmIF9fbmFtZV9fID09ICdf X21haW5fXyc6CiAJaWYgbGVuKHN5cy5hcmd2KSA8IDM6Ci0JCXByaW50ID4+c3lzLnN0ZGVyciwg IlVzYWdlOiBnZW5sZXZlbHMucHkgPG1saT4gPG1sPiA8Yy1pbmM+IgorCQlwcmludCgiVXNhZ2U6 IGdlbmxldmVscy5weSA8bWxpPiA8bWw+IDxjLWluYz4iLCBmaWxlPXN5cy5zdGRlcnIpCiAJCXN5 cy5leGl0KDEpCiAKIAlsZXZlbHMsIG9sZXZlbHMgPSByZWFkX2xldmVscygpCmRpZmYgLS1naXQg YS90b29scy9vY2FtbC9saWJzL3hsL2dlbndyYXAucHkgYi90b29scy9vY2FtbC9saWJzL3hsL2dl bndyYXAucHkKaW5kZXggODE1YzFjYjBlMy4uN2JmMjZiZGNkOCAxMDA2NDQKLS0tIGEvdG9vbHMv b2NhbWwvbGlicy94bC9nZW53cmFwLnB5CisrKyBiL3Rvb2xzL29jYW1sL2xpYnMveGwvZ2Vud3Jh cC5weQpAQCAtMSw2ICsxLDkgQEAKICMhL3Vzci9iaW4vcHl0aG9uCiAKK2Zyb20gX19mdXR1cmVf XyBpbXBvcnQgcHJpbnRfZnVuY3Rpb24KKwogaW1wb3J0IHN5cyxvcworZnJvbSBmdW5jdG9vbHMg aW1wb3J0IHJlZHVjZQogCiBpbXBvcnQgaWRsCiAKQEAgLTc4LDcgKzgxLDcgQEAgZGVmIG9jYW1s X3R5cGVfb2YodHkpOgogICAgIGVsaWYgaXNpbnN0YW5jZSh0eSxpZGwuQXJyYXkpOgogICAgICAg ICByZXR1cm4gIiVzIGFycmF5IiAlIG9jYW1sX3R5cGVfb2YodHkuZWxlbV90eXBlKQogICAgIGVs aWYgaXNpbnN0YW5jZSh0eSxpZGwuQnVpbHRpbik6Ci0gICAgICAgIGlmIG5vdCBidWlsdGlucy5o YXNfa2V5KHR5LnR5cGVuYW1lKToKKyAgICAgICAgaWYgdHkudHlwZW5hbWUgbm90IGluIGJ1aWx0 aW5zOgogICAgICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigiVW5rbm93biBCdWls dGluICVzICglcykiICUgKHR5LnR5cGVuYW1lLCB0eXBlKHR5KSkpCiAgICAgICAgIHR5cGVuYW1l LF8sXyA9IGJ1aWx0aW5zW3R5LnR5cGVuYW1lXQogICAgICAgICBpZiBub3QgdHlwZW5hbWU6CkBA IC0yNTEsNyArMjU0LDcgQEAgZGVmIGdlbl9vY2FtbF9tbCh0eSwgaW50ZXJmYWNlLCBpbmRlbnQ9 IiIpOgogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBzICs9ICJcdGV4dGVybmFs IGRlZmF1bHQgOiBjdHggLT4gJXN1bml0IC0+IHQgPSBcInN0dWJfbGlieGxfJXNfaW5pdFwiXG4i ICUgKHVuaW9uX2FyZ3MsIHR5LnJhd25hbWUpCiAKLSAgICAgICAgaWYgZnVuY3Rpb25zLmhhc19r ZXkodHkucmF3bmFtZSk6CisgICAgICAgIGlmIHR5LnJhd25hbWUgaW4gZnVuY3Rpb25zOgogICAg ICAgICAgICAgZm9yIG5hbWUsYXJncyBpbiBmdW5jdGlvbnNbdHkucmF3bmFtZV06CiAgICAgICAg ICAgICAgICAgcyArPSAiXHRleHRlcm5hbCAlcyA6ICIgJSBuYW1lCiAgICAgICAgICAgICAgICAg cyArPSAiIC0+ICIuam9pbihhcmdzKQpAQCAtMjc4LDcgKzI4MSw3IEBAIGRlZiBjX3ZhbCh0eSwg YywgbywgaW5kZW50PSIiLCBwYXJlbnQgPSBOb25lKToKICAgICAgICAgZWxzZToKICAgICAgICAg ICAgIHMgKz0gIiVzID0gSW50X3ZhbCglcyk7IiAlIChjLCBvKQogICAgIGVsaWYgaXNpbnN0YW5j ZSh0eSxpZGwuQnVpbHRpbik6Ci0gICAgICAgIGlmIG5vdCBidWlsdGlucy5oYXNfa2V5KHR5LnR5 cGVuYW1lKToKKyAgICAgICAgaWYgdHkudHlwZW5hbWUgbm90IGluIGJ1aWx0aW5zOgogICAgICAg ICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigiVW5rbm93biBCdWlsdGluICVzICglcyki ICUgKHR5LnR5cGVuYW1lLCB0eXBlKHR5KSkpCiAgICAgICAgIF8sZm4sXyA9IGJ1aWx0aW5zW3R5 LnR5cGVuYW1lXQogICAgICAgICBpZiBub3QgZm46CkBAIC0zNzUsNyArMzc4LDcgQEAgZGVmIG9j YW1sX1ZhbCh0eSwgbywgYywgaW5kZW50PSIiLCBwYXJlbnQgPSBOb25lKToKICAgICAgICAgZWxz ZToKICAgICAgICAgICAgIHMgKz0gIiVzID0gVmFsX2ludCglcyk7IiAlIChvLCBjKQogICAgIGVs aWYgaXNpbnN0YW5jZSh0eSxpZGwuQnVpbHRpbik6Ci0gICAgICAgIGlmIG5vdCBidWlsdGlucy5o YXNfa2V5KHR5LnR5cGVuYW1lKToKKyAgICAgICAgaWYgdHkudHlwZW5hbWUgbm90IGluIGJ1aWx0 aW5zOgogICAgICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigiVW5rbm93biBCdWls dGluICVzICglcykiICUgKHR5LnR5cGVuYW1lLCB0eXBlKHR5KSkpCiAgICAgICAgIF8sXyxmbiA9 IGJ1aWx0aW5zW3R5LnR5cGVuYW1lXQogICAgICAgICBpZiBub3QgZm46CkBAIC01MjAsNyArNTIz LDcgQEAgZGVmIGF1dG9nZW5faGVhZGVyKG9wZW5fY29tbWVudCwgY2xvc2VfY29tbWVudCk6CiAK IGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgaWYgbGVuKHN5cy5hcmd2KSA8IDQ6Ci0g ICAgICAgIHByaW50ID4+c3lzLnN0ZGVyciwgIlVzYWdlOiBnZW53cmFwLnB5IDxpZGw+IDxtbGk+ IDxtbD4gPGMtaW5jPiIKKyAgICAgICAgcHJpbnQoIlVzYWdlOiBnZW53cmFwLnB5IDxpZGw+IDxt bGk+IDxtbD4gPGMtaW5jPiIsIGZpbGU9c3lzLnN0ZGVycikKICAgICAgICAgc3lzLmV4aXQoMSkK IAogICAgIChfLHR5cGVzKSA9IGlkbC5wYXJzZShzeXMuYXJndlsxXSkKQEAgLTUzMyw3ICs1MzYs NyBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogCiAgICAgZm9yIHQgaW4gYmxhY2tsaXN0 OgogICAgICAgICBpZiB0IG5vdCBpbiBbdHkucmF3bmFtZSBmb3IgdHkgaW4gdHlwZXNdOgotICAg ICAgICAgICAgcHJpbnQgInVua25vd24gdHlwZSAlcyBpbiBibGFja2xpc3QiICUgdAorICAgICAg ICAgICAgcHJpbnQoInVua25vd24gdHlwZSAlcyBpbiBibGFja2xpc3QiICUgdCkKIAogICAgIHR5 cGVzID0gW3R5IGZvciB0eSBpbiB0eXBlcyBpZiBub3QgdHkucmF3bmFtZSBpbiBibGFja2xpc3Rd CiAKQEAgLTU2NCw3ICs1NjcsNyBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgICAg ICAgICAgY2luYy53cml0ZSgiXG4iKQogICAgICAgICBjaW5jLndyaXRlKGdlbl9WYWxfb2NhbWwo dHkpKQogICAgICAgICBjaW5jLndyaXRlKCJcbiIpCi0gICAgICAgIGlmIGZ1bmN0aW9ucy5oYXNf a2V5KHR5LnJhd25hbWUpOgorICAgICAgICBpZiB0eS5yYXduYW1lIGluIGZ1bmN0aW9uczoKICAg ICAgICAgICAgIGNpbmMud3JpdGUoZ2VuX2Nfc3R1Yl9wcm90b3R5cGUodHksIGZ1bmN0aW9uc1t0 eS5yYXduYW1lXSkpCiAgICAgICAgICAgICBjaW5jLndyaXRlKCJcbiIpCiAgICAgICAgIGlmIHR5 LmluaXRfZm4gaXMgbm90IE5vbmU6Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxt YW4vbGlzdGluZm8veGVuLWRldmVs