From: Wei Liu Subject: [PATCH for-next RFC 2/4] libxl: make python scripts work with python 2 and 3 Date: Tue, 5 Mar 2019 16:42:04 +0000 Message-ID: <20190305164206.6793-3-wei.liu2@citrix.com> References: <20190305164206.6793-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 1h1D91-0008Lr-B6 for xen-devel@lists.xenproject.org; Tue, 05 Mar 2019 16:42:19 +0000 In-Reply-To: <20190305164206.6793-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: George Dunlap , Anthony PERARD , Ian Jackson , Wei Liu , Andrew Cooper List-Id: xen-devel@lists.xenproject.org QWxsIHNjcmlwdHMgYXJlIHRyYW5zZm9ybWVkIGJ5IDJ0bzMuCgpUaGUgb25seSBhZGRpdGlvbiBp cyAiZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCBwcmludF9mdW5jdGlvbiIgc28gdGhhdApwcmludCgi QkxBSCIsIGZpbGU9c3lzLnN0ZGVycikgY2FuIHdvcmsuCgpodHRwczovL3B5dGhvbi1mdXR1cmUu b3JnL2NvbXBhdGlibGVfaWRpb21zLmh0bWwKClRlc3RlZCB3aXRoIDIuNyBhbmQgMy41LgoKU2ln bmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCkkgZG9uJ3QgaGF2 ZSBlbnZpcm9ubWVudCB0byB0ZXN0IDIuNCAtLSBpdCBpcyBhbG1vc3QgMTUgeWVhcnMgb2xkLiBX ZQptYXkgd2FudCB0byBjb25zaWRlciBidW1waW5nIHRoZSBtaW5pbXVtIHJlcXVpcmVtZW50IHRv IDIuNz8KLS0tCiB0b29scy9saWJ4bC9nZW50ZXN0LnB5ICB8ICA0ICsrKy0KIHRvb2xzL2xpYnhs L2dlbnR5cGVzLnB5IHwgMTIgKysrKysrKy0tLS0tCiB0b29scy9saWJ4bC9pZGwucHkgICAgICB8 IDIxICsrKysrKysrKysrLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25z KCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9nZW50ZXN0LnB5 IGIvdG9vbHMvbGlieGwvZ2VudGVzdC5weQppbmRleCA5ODk5NTlmYzY4Li4xY2M3ZWViYzgyIDEw MDY0NAotLS0gYS90b29scy9saWJ4bC9nZW50ZXN0LnB5CisrKyBiL3Rvb2xzL2xpYnhsL2dlbnRl c3QucHkKQEAgLTEsNSArMSw3IEBACiAjIS91c3IvYmluL3B5dGhvbgogCitmcm9tIF9fZnV0dXJl X18gaW1wb3J0IHByaW50X2Z1bmN0aW9uCisKIGltcG9ydCBvcwogaW1wb3J0IHN5cwogaW1wb3J0 IHJlCkBAIC04Niw3ICs4OCw3IEBAIGRlZiBnZW5fcmFuZF9pbml0KHR5LCB2LCBpbmRlbnQgPSAi ICAgICIsIHBhcmVudCA9IE5vbmUpOgogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAg IGlmIGxlbihzeXMuYXJndikgPCAzOgotICAgICAgICBwcmludCA+PnN5cy5zdGRlcnIsICJVc2Fn ZTogZ2VudGVzdC5weSA8aWRsPiA8aW1wbGVtZW50YXRpb24+IgorICAgICAgICBwcmludCgiVXNh Z2U6IGdlbnRlc3QucHkgPGlkbD4gPGltcGxlbWVudGF0aW9uPiIsIGZpbGU9c3lzLnN0ZGVycikK ICAgICAgICAgc3lzLmV4aXQoMSkKIAogICAgIHJhbmRvbS5zZWVkKG9zLmdldGVudignTElCWExf VEVTVElETF9TRUVEJykpCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9nZW50eXBlcy5weSBiL3Rv b2xzL2xpYnhsL2dlbnR5cGVzLnB5CmluZGV4IDg4ZTVjNWYzMGUuLjY0MTdjOWRkOGMgMTAwNjQ0 Ci0tLSBhL3Rvb2xzL2xpYnhsL2dlbnR5cGVzLnB5CisrKyBiL3Rvb2xzL2xpYnhsL2dlbnR5cGVz LnB5CkBAIC0xLDUgKzEsNyBAQAogIyEvdXNyL2Jpbi9weXRob24KIAorZnJvbSBfX2Z1dHVyZV9f IGltcG9ydCBwcmludF9mdW5jdGlvbgorCiBpbXBvcnQgc3lzCiBpbXBvcnQgcmUKIApAQCAtNTc2 LDE0ICs1NzgsMTQgQEAgZGVmIGxpYnhsX0NfZW51bV9mcm9tX3N0cmluZyh0eSwgc3RyLCBlLCBp bmRlbnQgPSAiICAgICIpOgogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIGlmIGxl bihzeXMuYXJndikgIT0gNjoKLSAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCAiVXNhZ2U6IGdl bnR5cGVzLnB5IDxpZGw+IDxoZWFkZXI+IDxoZWFkZXItcHJpdmF0ZT4gPGhlYWRlci1qc29uPiA8 aW1wbGVtZW50YXRpb24+IgorICAgICAgICBwcmludCgiVXNhZ2U6IGdlbnR5cGVzLnB5IDxpZGw+ IDxoZWFkZXI+IDxoZWFkZXItcHJpdmF0ZT4gPGhlYWRlci1qc29uPiA8aW1wbGVtZW50YXRpb24+ IiwgZmlsZT1zeXMuc3RkZXJyKQogICAgICAgICBzeXMuZXhpdCgxKQogCiAgICAgKF8sIGlkbG5h bWUsIGhlYWRlciwgaGVhZGVyX3ByaXZhdGUsIGhlYWRlcl9qc29uLCBpbXBsKSA9IHN5cy5hcmd2 CiAKICAgICAoYnVpbHRpbnMsdHlwZXMpID0gaWRsLnBhcnNlKGlkbG5hbWUpCiAKLSAgICBwcmlu dCAib3V0cHV0dGluZyBsaWJ4bCB0eXBlIGRlZmluaXRpb25zIHRvICVzIiAlIGhlYWRlcgorICAg IHByaW50KCJvdXRwdXR0aW5nIGxpYnhsIHR5cGUgZGVmaW5pdGlvbnMgdG8gJXMiICUgaGVhZGVy KQogCiAgICAgZiA9IG9wZW4oaGVhZGVyLCAidyIpCiAKQEAgLTYzMyw3ICs2MzUsNyBAQCBpZiBf X25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIGYud3JpdGUoIiIiI2VuZGlmIC8qICVzICovXG4i IiIgJSAoaGVhZGVyX2RlZmluZSkpCiAgICAgZi5jbG9zZSgpCiAKLSAgICBwcmludCAib3V0cHV0 dGluZyBsaWJ4bCBKU09OIGRlZmluaXRpb25zIHRvICVzIiAlIGhlYWRlcl9qc29uCisgICAgcHJp bnQoIm91dHB1dHRpbmcgbGlieGwgSlNPTiBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXJfanNv bikKIAogICAgIGYgPSBvcGVuKGhlYWRlcl9qc29uLCAidyIpCiAKQEAgLTY1Nyw3ICs2NTksNyBA QCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIGYud3JpdGUoIiIiI2VuZGlmIC8qICVz ICovXG4iIiIgJSBoZWFkZXJfanNvbl9kZWZpbmUpCiAgICAgZi5jbG9zZSgpCiAKLSAgICBwcmlu dCAib3V0cHV0dGluZyBsaWJ4bCB0eXBlIGludGVybmFsIGRlZmluaXRpb25zIHRvICVzIiAlIGhl YWRlcl9wcml2YXRlCisgICAgcHJpbnQoIm91dHB1dHRpbmcgbGlieGwgdHlwZSBpbnRlcm5hbCBk ZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXJfcHJpdmF0ZSkKIAogICAgIGYgPSBvcGVuKGhlYWRl cl9wcml2YXRlLCAidyIpCiAKQEAgLTY4Myw3ICs2ODUsNyBAQCBpZiBfX25hbWVfXyA9PSAnX19t YWluX18nOgogICAgIGYud3JpdGUoIiIiI2VuZGlmIC8qICVzICovXG4iIiIgJSBoZWFkZXJfanNv bl9kZWZpbmUpCiAgICAgZi5jbG9zZSgpCiAKLSAgICBwcmludCAib3V0cHV0dGluZyBsaWJ4bCB0 eXBlIGltcGxlbWVudGF0aW9ucyB0byAlcyIgJSBpbXBsCisgICAgcHJpbnQoIm91dHB1dHRpbmcg bGlieGwgdHlwZSBpbXBsZW1lbnRhdGlvbnMgdG8gJXMiICUgaW1wbCkKIAogICAgIGYgPSBvcGVu KGltcGwsICJ3IikKICAgICBmLndyaXRlKCIiIgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvaWRs LnB5IGIvdG9vbHMvbGlieGwvaWRsLnB5CmluZGV4IDJhN2YzYzQ0ZmUuLjI3YmQxMDUzYTYgMTAw NjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2lkbC5weQorKysgYi90b29scy9saWJ4bC9pZGwucHkKQEAg LTEsMyArMSw1IEBACitmcm9tIF9fZnV0dXJlX18gaW1wb3J0IHByaW50X2Z1bmN0aW9uCisKIGlt cG9ydCBzeXMKIAogUEFTU19CWV9WQUxVRSA9IDEKQEAgLTExLDcgKzEzLDcgQEAgRElSX0JPVEgg PSAzCiBfZGVmYXVsdF9uYW1lc3BhY2UgPSAiIgogZGVmIG5hbWVzcGFjZShzKToKICAgICBpZiB0 eXBlKHMpICE9IHN0cjoKLSAgICAgICAgcmFpc2UgVHlwZUVycm9yLCAiUmVxdWlyZSBhIHN0cmlu ZyBmb3IgdGhlIGRlZmF1bHQgbmFtZXNwYWNlLiIKKyAgICAgICAgcmFpc2UgVHlwZUVycm9yKCJS ZXF1aXJlIGEgc3RyaW5nIGZvciB0aGUgZGVmYXVsdCBuYW1lc3BhY2UuIikKICAgICBnbG9iYWwg X2RlZmF1bHRfbmFtZXNwYWNlCiAgICAgX2RlZmF1bHRfbmFtZXNwYWNlID0gcwogCkBAIC0yNjks NyArMjcxLDcgQEAgY2xhc3MgS2V5ZWRVbmlvbihBZ2dyZWdhdGUpOgogICAgICAgICBpZiBub3Qg aXNpbnN0YW5jZShrZXl2YXJfdHlwZSwgRW51bWVyYXRpb24pOgogICAgICAgICAgICAgcmFpc2Ug VmFsdWVFcnJvcgogCi0gICAgICAgIGt2X2t3YXJncyA9IGRpY3QoWyh4LmxzdHJpcCgna2V5dmFy XycpLHkpIGZvciAoeCx5KSBpbiBrd2FyZ3MuaXRlbXMoKSBpZiB4LnN0YXJ0c3dpdGgoJ2tleXZh cl8nKV0pCisgICAgICAgIGt2X2t3YXJncyA9IGRpY3QoWyh4LmxzdHJpcCgna2V5dmFyXycpLHkp IGZvciAoeCx5KSBpbiBsaXN0KGt3YXJncy5pdGVtcygpKSBpZiB4LnN0YXJ0c3dpdGgoJ2tleXZh cl8nKV0pCiAgICAgICAgIAogICAgICAgICBzZWxmLmtleXZhciA9IEZpZWxkKGtleXZhcl90eXBl LCBrZXl2YXJfbmFtZSwgKiprdl9rd2FyZ3MpCiAKQEAgLTMxNSw3ICszMTcsNyBAQCBjbGFzcyBB cnJheShUeXBlKToKICAgICAgICAga3dhcmdzLnNldGRlZmF1bHQoJ2pzb25fcGFyc2VfdHlwZScs ICdKU09OX0FSUkFZJykKICAgICAgICAgVHlwZS5fX2luaXRfXyhzZWxmLCBuYW1lc3BhY2U9ZWxl bV90eXBlLm5hbWVzcGFjZSwgdHlwZW5hbWU9ZWxlbV90eXBlLnJhd25hbWUgKyAiICoiLCAqKmt3 YXJncykKIAotICAgICAgICBsdl9rd2FyZ3MgPSBkaWN0KFsoeC5sc3RyaXAoJ2xlbnZhcl8nKSx5 KSBmb3IgKHgseSkgaW4ga3dhcmdzLml0ZW1zKCkgaWYgeC5zdGFydHN3aXRoKCdsZW52YXJfJyld KQorICAgICAgICBsdl9rd2FyZ3MgPSBkaWN0KFsoeC5sc3RyaXAoJ2xlbnZhcl8nKSx5KSBmb3Ig KHgseSkgaW4gbGlzdChrd2FyZ3MuaXRlbXMoKSkgaWYgeC5zdGFydHN3aXRoKCdsZW52YXJfJyld KQogCiAgICAgICAgIHNlbGYubGVudmFyID0gRmllbGQoaW50ZWdlciwgbGVudmFyX25hbWUsICoq bHZfa3dhcmdzKQogICAgICAgICBzZWxmLmVsZW1fdHlwZSA9IGVsZW1fdHlwZQpAQCAtMzQ2LDEy ICszNDgsMTIgQEAgY2xhc3MgT3JkZXJlZERpY3QoZGljdCk6CiAgICAgICAgIHJldHVybiBbKHgs c2VsZlt4XSkgZm9yIHggaW4gc2VsZi5fX29yZGVyZWRdCiAKIGRlZiBwYXJzZShmKToKLSAgICBw cmludCA+PnN5cy5zdGRlcnIsICJQYXJzaW5nICVzIiAlIGYKKyAgICBwcmludCgiUGFyc2luZyAl cyIgJSBmLCBmaWxlPXN5cy5zdGRlcnIpCiAKICAgICBnbG9icyA9IHt9CiAgICAgbG9jcyA9IE9y ZGVyZWREaWN0KCkKIAotICAgIGZvciBuLHQgaW4gZ2xvYmFscygpLml0ZW1zKCk6CisgICAgZm9y IG4sdCBpbiBsaXN0KGdsb2JhbHMoKS5pdGVtcygpKToKICAgICAgICAgaWYgaXNpbnN0YW5jZSh0 LCBUeXBlKToKICAgICAgICAgICAgIGdsb2JzW25dID0gdAogICAgICAgICBlbGlmIGlzaW5zdGFu Y2UodCx0eXBlKG9iamVjdCkpIGFuZCBpc3N1YmNsYXNzKHQsIFR5cGUpOgpAQCAtMzYyLDExICsz NjQsMTAgQEAgZGVmIHBhcnNlKGYpOgogICAgICAgICAgICAgZ2xvYnNbbl0gPSB0CiAKICAgICB0 cnk6Ci0gICAgICAgIGV4ZWNmaWxlKGYsIGdsb2JzLCBsb2NzKQotICAgIGV4Y2VwdCBTeW50YXhF cnJvcixlOgotICAgICAgICByYWlzZSBTeW50YXhFcnJvciwgXAotICAgICAgICAgICAgICAiRXJy b3JzIHdlcmUgZm91bmQgYXQgbGluZSAlZCB3aGlsZSBwcm9jZXNzaW5nICVzOlxuXHQlcyJcCi0g ICAgICAgICAgICAgICUoZS5saW5lbm8sZixlLnRleHQpCisgICAgICAgIGV4ZWMoY29tcGlsZShv cGVuKGYpLnJlYWQoKSwgZiwgJ2V4ZWMnKSwgZ2xvYnMsIGxvY3MpCisgICAgZXhjZXB0IFN5bnRh eEVycm9yIGFzIGU6CisgICAgICAgIHJhaXNlIFN5bnRheEVycm9yKCJFcnJvcnMgd2VyZSBmb3Vu ZCBhdCBsaW5lICVkIHdoaWxlIHByb2Nlc3NpbmcgJXM6XG5cdCVzIlwKKyAgICAgICAgICAgICAg JShlLmxpbmVubyxmLGUudGV4dCkpCiAKICAgICB0eXBlcyA9IFt0IGZvciB0IGluIGxvY3Mub3Jk ZXJlZF92YWx1ZXMoKSBpZiBpc2luc3RhbmNlKHQsVHlwZSldCiAKLS0gCjIuMTEuMAoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVu cHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=