From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 7/8] python: adjust module initalization for Python3 Date: Thu, 23 Feb 2017 11:48:27 +0100 Message-ID: <1487846908-21462-8-git-send-email-marmarek@invisiblethingslab.com> References: <1487846908-21462-1-git-send-email-marmarek@invisiblethingslab.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1487846908-21462-1-git-send-email-marmarek@invisiblethingslab.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Wei Liu , Ian Jackson , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= List-Id: xen-devel@lists.xenproject.org SW4gUHl0aG9uMywgUHlUeXBlT2JqZWN0IGxvb2tzIHNsaWdodGx5IGRpZmZlcmVudCwgYW5kIGFs c28gbW9kdWxlCmluaXRpYWxpemF0aW9uIGlzIGRpZmZlcmVudC4gSW5zdGVhZCBvZiBQeV9Jbml0 TW9kdWxlLCBQeU1vZHVsZV9DcmVhdGUKc2hvdWxkIGJlIGNhbGxlZCBvbiBhbHJlYWR5IGRlZmlu ZWQgUHlNb2R1bGVEZWYgc3RydWN0dXJlLiBBbmQgdGhlbgppbml0aWFsaXphdGlvbiBmdW5jdGlv biBzaG91bGQgcmV0dXJuIHRoYXQgbW9kdWxlLgoKQWRkaXRpb25hbGx5IGluaXRpYWxpemF0aW9u IGZ1bmN0aW9uIHNob3VsZCBiZSBuYW1lZCBQeUluaXRfPG5hbWU+LAppbnN0ZWFkIG9mIGluaXQ8 bmFtZT4uCgpTaWduZWQtb2ZmLWJ5OiBNYXJlayBNYXJjenlrb3dza2ktR8OzcmVja2kgPG1hcm1h cmVrQGludmlzaWJsZXRoaW5nc2xhYi5jb20+Ci0tLQogdG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZl bC94Yy94Yy5jIHwgMzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0KIHRvb2xz L3B5dGhvbi94ZW4vbG93bGV2ZWwveHMveHMuYyB8IDM0ICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKystLS0KIDIgZmlsZXMgY2hhbmdlZCwgNjMgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9weXRob24veGVuL2xvd2xldmVsL3hjL3hjLmMgYi90 b29scy9weXRob24veGVuL2xvd2xldmVsL3hjL3hjLmMKaW5kZXggZGYzMWExZC4uZDA5YzQ1ZiAx MDA2NDQKLS0tIGEvdG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94Yy94Yy5jCisrKyBiL3Rvb2xz L3B5dGhvbi94ZW4vbG93bGV2ZWwveGMveGMuYwpAQCAtMjY4NSw3ICsyNjg1LDExIEBAIHN0YXRp YyB2b2lkIFB5WGNfZGVhbGxvYyhYY09iamVjdCAqc2VsZikKIH0KIAogc3RhdGljIFB5VHlwZU9i amVjdCBQeVhjVHlwZSA9IHsKKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKKyAgICAub2JfYmFz ZSA9IHsgUHlPYmplY3RfSEVBRF9JTklUKE5VTEwpIH0sCisjZWxzZQogICAgIFB5T2JqZWN0X0hF QURfSU5JVChOVUxMKQorI2VuZGlmCiAgICAgLnRwX25hbWUgPSBQS0cgIi4iIENMUywKICAgICAu dHBfYmFzaWNzaXplID0gc2l6ZW9mKFhjT2JqZWN0KSwKICAgICAudHBfaXRlbXNpemUgPSAwLApA QCAtMjY5OSwyMiArMjcwMyw0NCBAQCBzdGF0aWMgUHlUeXBlT2JqZWN0IFB5WGNUeXBlID0gewog CiBzdGF0aWMgUHlNZXRob2REZWYgeGNfbWV0aG9kc1tdID0geyB7IE5VTEwgfSB9OwogCisKKyNp ZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKK3N0YXRpYyBQeU1vZHVsZURlZiB4Y19tb2R1bGUgPSB7 CisgICAgUHlNb2R1bGVEZWZfSEVBRF9JTklULAorICAgIFBLRywgICAgIC8qIG5hbWUgKi8KKyAg ICBOVUxMLCAgIC8qIGRvY3N0cmluZyAqLworICAgIC0xLCAgICAgLyogc2l6ZSBvZiBwZXItaW50 ZXJwcmV0ZXIgc3RhdGUsIC0xIG1lYW5zIHRoZSBtb2R1bGUgdXNlIGdsb2JhbAorICAgICAgICAg ICAgICAgdmFyaWFibGVzICovCisgICAgeGNfbWV0aG9kcworfTsKKyNlbmRpZgorCisjaWYgUFlf TUFKT1JfVkVSU0lPTiA+PSAzCisjZGVmaW5lIElOSVRFUlJPUiByZXR1cm4gTlVMTAorUHlNT0RJ TklUX0ZVTkMgUHlJbml0X3hjKHZvaWQpCisjZWxzZQorI2RlZmluZSBJTklURVJST1IgcmV0dXJu CiBQeU1PRElOSVRfRlVOQyBpbml0eGModm9pZCkKKyNlbmRpZgogewogICAgIFB5T2JqZWN0ICpt OwogCiAgICAgaWYgKFB5VHlwZV9SZWFkeSgmUHlYY1R5cGUpIDwgMCkKLSAgICAgICAgcmV0dXJu OworICAgICAgICBJTklURVJST1I7CiAKKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKKyAgICBt ID0gUHlNb2R1bGVfQ3JlYXRlKCZ4Y19tb2R1bGUpOworI2Vsc2UKICAgICBtID0gUHlfSW5pdE1v ZHVsZShQS0csIHhjX21ldGhvZHMpOworI2VuZGlmCiAKICAgICBpZiAobSA9PSBOVUxMKQotICAg ICAgcmV0dXJuOworICAgICAgICBJTklURVJST1I7CiAKICAgICB4Y19lcnJvcl9vYmogPSBQeUVy cl9OZXdFeGNlcHRpb24oUEtHICIuRXJyb3IiLCBQeUV4Y19SdW50aW1lRXJyb3IsIE5VTEwpOwog ICAgIGlmICh4Y19lcnJvcl9vYmogPT0gTlVMTCkgewogICAgICAgICBQeV9ERUNSRUYobSk7Ci0g ICAgICAgIHJldHVybjsKKyAgICAgICAgSU5JVEVSUk9SOwogICAgIH0KICAgICB6ZXJvID0gUHlM b25nT3JJbnRfRnJvbUxvbmcoMCk7CiAKQEAgLTI3MzIsNiArMjc1OCw5IEBAIFB5TU9ESU5JVF9G VU5DIGluaXR4Yyh2b2lkKQogICAgIFB5TW9kdWxlX0FkZEludENvbnN0YW50KG0sICJYRU5fU0NI RURVTEVSX0NSRURJVCIsIFhFTl9TQ0hFRFVMRVJfQ1JFRElUKTsKICAgICBQeU1vZHVsZV9BZGRJ bnRDb25zdGFudChtLCAiWEVOX1NDSEVEVUxFUl9DUkVESVQyIiwgWEVOX1NDSEVEVUxFUl9DUkVE SVQyKTsKIAorI2lmIFBZX01BSk9SX1ZFUlNJT04gPj0gMworICAgIHJldHVybiBtOworI2VuZGlm CiB9CiAKIApkaWZmIC0tZ2l0IGEvdG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94cy94cy5jIGIv dG9vbHMvcHl0aG9uL3hlbi9sb3dsZXZlbC94cy94cy5jCmluZGV4IGIzN2RhYTkuLmFiYTVhMjAg MTAwNjQ0Ci0tLSBhL3Rvb2xzL3B5dGhvbi94ZW4vbG93bGV2ZWwveHMveHMuYworKysgYi90b29s cy9weXRob24veGVuL2xvd2xldmVsL3hzL3hzLmMKQEAgLTk0Niw3ICs5NDYsMTEgQEAgc3RhdGlj IHZvaWQgeHNoYW5kbGVfZGVhbGxvYyhYc0hhbmRsZSAqc2VsZikKIH0KIAogc3RhdGljIFB5VHlw ZU9iamVjdCB4c2hhbmRsZV90eXBlID0geworI2lmIFBZX01BSk9SX1ZFUlNJT04gPj0gMworICAg IC5vYl9iYXNlID0geyBQeU9iamVjdF9IRUFEX0lOSVQoTlVMTCkgfSwKKyNlbHNlCiAgICAgUHlP YmplY3RfSEVBRF9JTklUKE5VTEwpCisjZW5kaWYKICAgICAudHBfbmFtZSA9IFBLRyAiLiIgQ0xT LAogICAgIC50cF9iYXNpY3NpemUgPSBzaXplb2YoWHNIYW5kbGUpLAogICAgIC50cF9pdGVtc2l6 ZSA9IDAsCkBAIC05NjAsMjIgKzk2NCw0MyBAQCBzdGF0aWMgUHlUeXBlT2JqZWN0IHhzaGFuZGxl X3R5cGUgPSB7CiAKIHN0YXRpYyBQeU1ldGhvZERlZiB4c19tZXRob2RzW10gPSB7IHsgTlVMTCB9 IH07CiAKKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKK3N0YXRpYyBQeU1vZHVsZURlZiB4c19t b2R1bGUgPSB7CisgICAgUHlNb2R1bGVEZWZfSEVBRF9JTklULAorICAgIFBLRywgICAgIC8qIG5h bWUgKi8KKyAgICBOVUxMLCAgIC8qIGRvY3N0cmluZyAqLworICAgIC0xLCAgICAgLyogc2l6ZSBv ZiBwZXItaW50ZXJwcmV0ZXIgc3RhdGUsIC0xIG1lYW5zIHRoZSBtb2R1bGUgdXNlIGdsb2JhbAor ICAgICAgICAgICAgICAgdmFyaWFibGVzICovCisgICAgeHNfbWV0aG9kcworfTsKKyNlbmRpZgor CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA+PSAzCisjZGVmaW5lIElOSVRFUlJPUiByZXR1cm4gTlVM TAorUHlNT0RJTklUX0ZVTkMgUHlJbml0X3hzKHZvaWQpCisjZWxzZQorI2RlZmluZSBJTklURVJS T1IgcmV0dXJuCiBQeU1PRElOSVRfRlVOQyBpbml0eHModm9pZCkKKyNlbmRpZgogewogICAgIFB5 T2JqZWN0KiBtOwogCiAgICAgaWYgKFB5VHlwZV9SZWFkeSgmeHNoYW5kbGVfdHlwZSkgPCAwKQot ICAgICAgICByZXR1cm47CisgICAgICAgIElOSVRFUlJPUjsKIAorI2lmIFBZX01BSk9SX1ZFUlNJ T04gPj0gMworICAgIG0gPSBQeU1vZHVsZV9DcmVhdGUoJnhzX21vZHVsZSk7CisjZWxzZQogICAg IG0gPSBQeV9Jbml0TW9kdWxlKFBLRywgeHNfbWV0aG9kcyk7CisjZW5kaWYKIAogICAgIGlmICht ID09IE5VTEwpCi0gICAgICByZXR1cm47CisgICAgICAgIElOSVRFUlJPUjsKIAogICAgIHhzX2Vy cm9yID0gUHlFcnJfTmV3RXhjZXB0aW9uKFBLRyAiLkVycm9yIiwgUHlFeGNfUnVudGltZUVycm9y LCBOVUxMKTsKICAgICBpZiAoeHNfZXJyb3IgPT0gTlVMTCkgewogICAgICAgICBQeV9ERUNSRUYo bSk7Ci0gICAgICAgIHJldHVybjsKKyAgICAgICAgSU5JVEVSUk9SOwogICAgIH0KIAogICAgIFB5 X0lOQ1JFRigmeHNoYW5kbGVfdHlwZSk7CkBAIC05ODMsNiArMTAwOCw5IEBAIFB5TU9ESU5JVF9G VU5DIGluaXR4cyh2b2lkKQogCiAgICAgUHlfSU5DUkVGKHhzX2Vycm9yKTsKICAgICBQeU1vZHVs ZV9BZGRPYmplY3QobSwgIkVycm9yIiwgeHNfZXJyb3IpOworI2lmIFBZX01BSk9SX1ZFUlNJT04g Pj0gMworICAgIHJldHVybiBtOworI2VuZGlmCiB9CiAKIAotLSAKMi43LjQKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBs aXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2 ZWwK