From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH for-next v2 v2 2/5] libxl: make python scripts work with python 2.6 and up Date: Wed, 6 Mar 2019 17:52:07 +0000 Message-ID: <20190306175210.28145-3-wei.liu2@citrix.com> References: <20190306175210.28145-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 1h1aiT-0000Xm-AC for xen-devel@lists.xenproject.org; Wed, 06 Mar 2019 17:52:29 +0000 In-Reply-To: <20190306175210.28145-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 , Wei Liu , Ian Jackson , Andrew Cooper List-Id: xen-devel@lists.xenproject.org R28gdGhyb3VnaCB0aGUgdHJhbnNmb3JtYXRpb25zIHN1Z2dlc3RlZCBieSAydG8zIGFuZCBwaWNr IHRoZQpuZWNlc3Nhcnkgb25lcy4KClVzZSBzeXMuc3RkZXJyLndyaXRlIHRvIGF2b2lkIGltcG9y dGluZyBmcm9tIF9fZnV0dXJlX18uCgpTaWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBj aXRyaXguY29tPgotLS0KIHRvb2xzL2xpYnhsL2dlbnRlc3QucHkgIHwgIDIgKy0KIHRvb2xzL2xp YnhsL2dlbnR5cGVzLnB5IHwgMTAgKysrKystLS0tLQogdG9vbHMvbGlieGwvaWRsLnB5ICAgICAg fCAxMyArKysrKystLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2dlbnRlc3QucHkgYi90b29s cy9saWJ4bC9nZW50ZXN0LnB5CmluZGV4IDk4OTk1OWZjNjguLjgxZTEzYjQzN2MgMTAwNjQ0Ci0t LSBhL3Rvb2xzL2xpYnhsL2dlbnRlc3QucHkKKysrIGIvdG9vbHMvbGlieGwvZ2VudGVzdC5weQpA QCAtODYsNyArODYsNyBAQCBkZWYgZ2VuX3JhbmRfaW5pdCh0eSwgdiwgaW5kZW50ID0gIiAgICAi LCBwYXJlbnQgPSBOb25lKToKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBpZiBs ZW4oc3lzLmFyZ3YpIDwgMzoKLSAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCAiVXNhZ2U6IGdl bnRlc3QucHkgPGlkbD4gPGltcGxlbWVudGF0aW9uPiIKKyAgICAgICAgc3lzLnN0ZGVyci53cml0 ZSgiVXNhZ2U6IGdlbnRlc3QucHkgPGlkbD4gPGltcGxlbWVudGF0aW9uPlxuIikKICAgICAgICAg c3lzLmV4aXQoMSkKIAogICAgIHJhbmRvbS5zZWVkKG9zLmdldGVudignTElCWExfVEVTVElETF9T RUVEJykpCmRpZmYgLS1naXQgYS90b29scy9saWJ4bC9nZW50eXBlcy5weSBiL3Rvb2xzL2xpYnhs L2dlbnR5cGVzLnB5CmluZGV4IDg4ZTVjNWYzMGUuLjY1NmMxNTdjMDEgMTAwNjQ0Ci0tLSBhL3Rv b2xzL2xpYnhsL2dlbnR5cGVzLnB5CisrKyBiL3Rvb2xzL2xpYnhsL2dlbnR5cGVzLnB5CkBAIC01 NzYsMTQgKzU3NiwxNCBAQCBkZWYgbGlieGxfQ19lbnVtX2Zyb21fc3RyaW5nKHR5LCBzdHIsIGUs IGluZGVudCA9ICIgICAgIik6CiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgaWYg bGVuKHN5cy5hcmd2KSAhPSA2OgotICAgICAgICBwcmludCA+PnN5cy5zdGRlcnIsICJVc2FnZTog Z2VudHlwZXMucHkgPGlkbD4gPGhlYWRlcj4gPGhlYWRlci1wcml2YXRlPiA8aGVhZGVyLWpzb24+ IDxpbXBsZW1lbnRhdGlvbj4iCisgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIlVzYWdlOiBnZW50 eXBlcy5weSA8aWRsPiA8aGVhZGVyPiA8aGVhZGVyLXByaXZhdGU+IDxoZWFkZXItanNvbj4gPGlt cGxlbWVudGF0aW9uPlxuIikKICAgICAgICAgc3lzLmV4aXQoMSkKIAogICAgIChfLCBpZGxuYW1l LCBoZWFkZXIsIGhlYWRlcl9wcml2YXRlLCBoZWFkZXJfanNvbiwgaW1wbCkgPSBzeXMuYXJndgog CiAgICAgKGJ1aWx0aW5zLHR5cGVzKSA9IGlkbC5wYXJzZShpZGxuYW1lKQogCi0gICAgcHJpbnQg Im91dHB1dHRpbmcgbGlieGwgdHlwZSBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXIKKyAgICBw cmludCgib3V0cHV0dGluZyBsaWJ4bCB0eXBlIGRlZmluaXRpb25zIHRvICVzIiAlIGhlYWRlcikK IAogICAgIGYgPSBvcGVuKGhlYWRlciwgInciKQogCkBAIC02MzMsNyArNjMzLDcgQEAgaWYgX19u YW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBmLndyaXRlKCIiIiNlbmRpZiAvKiAlcyAqL1xuIiIi ICUgKGhlYWRlcl9kZWZpbmUpKQogICAgIGYuY2xvc2UoKQogCi0gICAgcHJpbnQgIm91dHB1dHRp bmcgbGlieGwgSlNPTiBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXJfanNvbgorICAgIHByaW50 KCJvdXRwdXR0aW5nIGxpYnhsIEpTT04gZGVmaW5pdGlvbnMgdG8gJXMiICUgaGVhZGVyX2pzb24p CiAKICAgICBmID0gb3BlbihoZWFkZXJfanNvbiwgInciKQogCkBAIC02NTcsNyArNjU3LDcgQEAg aWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBmLndyaXRlKCIiIiNlbmRpZiAvKiAlcyAq L1xuIiIiICUgaGVhZGVyX2pzb25fZGVmaW5lKQogICAgIGYuY2xvc2UoKQogCi0gICAgcHJpbnQg Im91dHB1dHRpbmcgbGlieGwgdHlwZSBpbnRlcm5hbCBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFk ZXJfcHJpdmF0ZQorICAgIHByaW50KCJvdXRwdXR0aW5nIGxpYnhsIHR5cGUgaW50ZXJuYWwgZGVm aW5pdGlvbnMgdG8gJXMiICUgaGVhZGVyX3ByaXZhdGUpCiAKICAgICBmID0gb3BlbihoZWFkZXJf cHJpdmF0ZSwgInciKQogCkBAIC02ODMsNyArNjgzLDcgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFp bl9fJzoKICAgICBmLndyaXRlKCIiIiNlbmRpZiAvKiAlcyAqL1xuIiIiICUgaGVhZGVyX2pzb25f ZGVmaW5lKQogICAgIGYuY2xvc2UoKQogCi0gICAgcHJpbnQgIm91dHB1dHRpbmcgbGlieGwgdHlw ZSBpbXBsZW1lbnRhdGlvbnMgdG8gJXMiICUgaW1wbAorICAgIHByaW50KCJvdXRwdXR0aW5nIGxp YnhsIHR5cGUgaW1wbGVtZW50YXRpb25zIHRvICVzIiAlIGltcGwpCiAKICAgICBmID0gb3Blbihp bXBsLCAidyIpCiAgICAgZi53cml0ZSgiIiIKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2lkbC5w eSBiL3Rvb2xzL2xpYnhsL2lkbC5weQppbmRleCAyYTdmM2M0NGZlLi5iNWJmYzY2YjUwIDEwMDY0 NAotLS0gYS90b29scy9saWJ4bC9pZGwucHkKKysrIGIvdG9vbHMvbGlieGwvaWRsLnB5CkBAIC0x MSw3ICsxMSw3IEBAIERJUl9CT1RIID0gMwogX2RlZmF1bHRfbmFtZXNwYWNlID0gIiIKIGRlZiBu YW1lc3BhY2Uocyk6CiAgICAgaWYgdHlwZShzKSAhPSBzdHI6Ci0gICAgICAgIHJhaXNlIFR5cGVF cnJvciwgIlJlcXVpcmUgYSBzdHJpbmcgZm9yIHRoZSBkZWZhdWx0IG5hbWVzcGFjZS4iCisgICAg ICAgIHJhaXNlIFR5cGVFcnJvcigiUmVxdWlyZSBhIHN0cmluZyBmb3IgdGhlIGRlZmF1bHQgbmFt ZXNwYWNlLiIpCiAgICAgZ2xvYmFsIF9kZWZhdWx0X25hbWVzcGFjZQogICAgIF9kZWZhdWx0X25h bWVzcGFjZSA9IHMKIApAQCAtMzQ2LDcgKzM0Niw3IEBAIGNsYXNzIE9yZGVyZWREaWN0KGRpY3Qp OgogICAgICAgICByZXR1cm4gWyh4LHNlbGZbeF0pIGZvciB4IGluIHNlbGYuX19vcmRlcmVkXQog CiBkZWYgcGFyc2UoZik6Ci0gICAgcHJpbnQgPj5zeXMuc3RkZXJyLCAiUGFyc2luZyAlcyIgJSBm CisgICAgc3lzLnN0ZGVyci53cml0ZSgiUGFyc2luZyAlc1xuIiAlIGYpCiAKICAgICBnbG9icyA9 IHt9CiAgICAgbG9jcyA9IE9yZGVyZWREaWN0KCkKQEAgLTM2MiwxMSArMzYyLDEwIEBAIGRlZiBw YXJzZShmKToKICAgICAgICAgICAgIGdsb2JzW25dID0gdAogCiAgICAgdHJ5OgotICAgICAgICBl eGVjZmlsZShmLCBnbG9icywgbG9jcykKLSAgICBleGNlcHQgU3ludGF4RXJyb3IsZToKLSAgICAg ICAgcmFpc2UgU3ludGF4RXJyb3IsIFwKLSAgICAgICAgICAgICAgIkVycm9ycyB3ZXJlIGZvdW5k IGF0IGxpbmUgJWQgd2hpbGUgcHJvY2Vzc2luZyAlczpcblx0JXMiXAotICAgICAgICAgICAgICAl KGUubGluZW5vLGYsZS50ZXh0KQorICAgICAgICBleGVjKGNvbXBpbGUob3BlbihmKS5yZWFkKCks IGYsICdleGVjJyksIGdsb2JzLCBsb2NzKQorICAgIGV4Y2VwdCBTeW50YXhFcnJvciBhcyBlOgor ICAgICAgICByYWlzZSBTeW50YXhFcnJvcigiRXJyb3JzIHdlcmUgZm91bmQgYXQgbGluZSAlZCB3 aGlsZSBwcm9jZXNzaW5nICVzOlxuXHQlcyJcCisgICAgICAgICAgICAgICUoZS5saW5lbm8sZixl LnRleHQpKQogCiAgICAgdHlwZXMgPSBbdCBmb3IgdCBpbiBsb2NzLm9yZGVyZWRfdmFsdWVzKCkg aWYgaXNpbnN0YW5jZSh0LFR5cGUpXQogCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21h aWxtYW4vbGlzdGluZm8veGVuLWRldmVs