Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1govt9-00068Y-G6 for pgadmin-hackers@arkaria.postgresql.org; Wed, 30 Jan 2019 19:51:11 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1govt7-0003e6-IY for pgadmin-hackers@arkaria.postgresql.org; Wed, 30 Jan 2019 19:51:09 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1govt6-0003dz-UU for pgadmin-hackers@lists.postgresql.org; Wed, 30 Jan 2019 19:51:09 +0000 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1govsz-0000je-KZ for pgadmin-hackers@postgresql.org; Wed, 30 Jan 2019 19:51:07 +0000 Received: by mail-io1-xd2d.google.com with SMTP id l14so622568ioj.5 for ; Wed, 30 Jan 2019 11:51:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=KawVRtiPwsk0SjCSOhI/OSJrQinT7X+QShBbYJyTx/U=; b=tNkqboqiVHQ9ZwIswrZX5CBF0wjDYzqPJ0+IWz9c7RPsbJpkU3ZbTo5npYGpdGE+wT ocadsvHImqENcK9t50so6TufMlcmS+l4jSaG4LqPpLN1dAKcxoFNF+JaDtbzW1KR+StK 15o82YTrlv/PojF7UXPDzKgh3pPI+ALDmU0tZLPtQLoKIGyLh8OVtt/Ad3zBmmaVorHu sBXkgoSw1SUJtDK+wLAIFsQq+f1W/3YEStzwfkNaK0DlKdH7OEzjpUQeVgi5ZzPop0Ku tIsS5Q2CLnw3aecbmauXcVdX9AXh/n1WYlhJe73nEDJ5mu7OQcKnqSJhAlxyFLzMlgDb wcNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=KawVRtiPwsk0SjCSOhI/OSJrQinT7X+QShBbYJyTx/U=; b=Wv7tzIHvZy/fdyuJjUMqhAnKsU6nztOu1afJ5KHl2OSUmiyrLGirMq1rDRg0Ftg0Fa PwxXem9JbP22sL6lsIyQHssKh2mSfP2EEQ2VgQ8tUDsWAanq8N9vJcCismAhQ5inQXWj sxC9U2U0P7HoAQzul/f2a6hvq5mjlqF8K60OhA9Q+1ZjXQaNdB5hn3AQeQz2ZQGuO5oi Duy/31gpaP7mSGr71sTWlRU5oHTZ32RIdvO5zuBTbw91buhiIL0AfgABgEtKeNKtilNp eQcTOg1r5z9udEIhaGytN15UFXezEYzwgGTEmOQnh1qjxNQHfBsIxTPp1Ia3neO6h6vi z+Ew== X-Gm-Message-State: AHQUAub+fZWDX/2GDy1bvvBqYAqrr36KjMrnyiM6aSRTJ/DxmjphRlbK //uNMXskojJGmJjYLmM2N17Sg/bsLUvfXbAkYtkc0g== X-Google-Smtp-Source: ALg8bN5ZH82NL3qHKkBugq2tj65H83a1e05GAES6W46AWG4NWhqov3PR7Z4Np1M/eYOxmmhwwJPapHUCPZdTH/pinnA= X-Received: by 2002:a6b:b28a:: with SMTP id b132mr18438516iof.256.1548877860353; Wed, 30 Jan 2019 11:51:00 -0800 (PST) MIME-Version: 1.0 From: Cyril Jouve Date: Wed, 30 Jan 2019 20:50:49 +0100 Message-ID: Subject: Remove python 2.6 specific code To: pgadmin-hackers@postgresql.org Content-Type: multipart/mixed; boundary="000000000000aae3500580b23a76" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000aae3500580b23a76 Content-Type: multipart/alternative; boundary="000000000000aae34d0580b23a74" --000000000000aae34d0580b23a74 Content-Type: text/plain; charset="UTF-8" Hi, Since python 2.6 is deprecated , this patch removes python 2.6 specific code. Regards, Cyril --000000000000aae34d0580b23a74 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Since python 2.6 is X-Attachment-Id: f_jrjluqt10 RnJvbSBkZGNhZmU0ZDk3ZDhiYzhjZjczOWQ2NzU3YTEzYjYzNjM1ZGZkZTJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDeXJpbCBKb3V2ZSA8anYuY3lyaWxAZ21haWwuY29tPgpEYXRl OiBXZWQsIDMwIEphbiAyMDE5IDIwOjM3OjE4ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gcmVtb3Zl IHB5dGhvbiAyLjYgY29tcGF0aWJpbGl0eSBjb2RlCgotLS0KIHBrZy9waXAvc2V0dXBfcGlwLnB5 ICAgICAgICAgICAgICAgICAgICAgICAgICB8IDIwIC0tLS0tLS0tLS0tLQogcmVxdWlyZW1lbnRz LnR4dCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMzEgKysrKystLS0tLS0tLS0tLS0t LQogLi4uL3Rvb2xzL2JhY2t1cC90ZXN0cy90ZXN0X2JhdGNoX3Byb2Nlc3MucHkgIHwgIDUgKy0t CiAuLi4vdGVzdHMvdGVzdF9iYXRjaF9wcm9jZXNzX21haW50ZW5hbmNlLnB5ICAgfCAgNSArLS0K IC4uLi90b29scy9yZXN0b3JlL3Rlc3RzL3Rlc3RfYmF0Y2hfcHJvY2Vzcy5weSB8ICA1ICstLQog d2ViL3BnYWRtaW4vdXRpbHMvcm91dGUucHkgICAgICAgICAgICAgICAgICAgIHwgIDUgKy0tCiAu Li4vdXRpbHMvc3FsYXV0b2NvbXBsZXRlL2F1dG9jb21wbGV0ZS5weSAgICAgfCAgNiArLS0tCiB3 ZWIvcmVncmVzc2lvbi9yZXF1aXJlbWVudHMudHh0ICAgICAgICAgICAgICAgfCAxMiArLS0tLS0t CiB3ZWIvcmVncmVzc2lvbi9ydW50ZXN0cy5weSAgICAgICAgICAgICAgICAgICAgfCAxNSArKysr LS0tLS0KIDkgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwgODQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvcGtnL3BpcC9zZXR1cF9waXAucHkgYi9wa2cvcGlwL3NldHVwX3BpcC5w eQppbmRleCBhNjliNmY2ZS4uZjFiYjRhZjQgMTAwNjQ0Ci0tLSBhL3BrZy9waXAvc2V0dXBfcGlw LnB5CisrKyBiL3BrZy9waXAvc2V0dXBfcGlwLnB5CkBAIC02Niw3ICs2Niw2IEBAIHNldHVwKAog ICAgICdEZXZlbG9wbWVudCBTdGF0dXMgOjogNSAtIFByb2R1Y3Rpb24vU3RhYmxlJywKIAogICAg ICMgU3VwcG9ydGVkIHByb2dyYW1taW5nIGxhbmd1YWdlcwotICAgICdQcm9ncmFtbWluZyBMYW5n dWFnZSA6OiBQeXRob24gOjogMi42JywKICAgICAnUHJvZ3JhbW1pbmcgTGFuZ3VhZ2UgOjogUHl0 aG9uIDo6IDIuNycsCiAgICAgJ1Byb2dyYW1taW5nIExhbmd1YWdlIDo6IFB5dGhvbiA6OiAzLjMn LAogICAgICdQcm9ncmFtbWluZyBMYW5ndWFnZSA6OiBQeXRob24gOjogMy40JywKQEAgLTg1LDI4 ICs4NCw5IEBAIHNldHVwKAogICAgIGluc3RhbGxfcmVxdWlyZXM9cmVxdWlyZWQsCiAKICAgICBl eHRyYXNfcmVxdWlyZT17Ci0gICAgICAgICMgLi4uCi0gICAgICAgICI6cHl0aG9uX3ZlcnNpb248 JzIuNyciOiBbCi0gICAgICAgICAgICAicHN5Y29wZzI9PTIuNy4zLjIiLAotICAgICAgICAgICAg IkZsYXNrLVNjcmlwdD09Mi4wLjUiLAotICAgICAgICAgICAgIm9yZGVyZWRkaWN0IiwKLSAgICAg ICAgICAgICJweXRob24tZGF0ZXV0aWw9PTIuNS4wIiwKLSAgICAgICAgICAgICJTUUxBbGNoZW15 PT0xLjAuMTQiLAotICAgICAgICAgICAgIkZsYXNrLVNlY3VyaXR5PT0xLjcuNSIsCi0gICAgICAg ICAgICAiRmxhc2stQmFiZWxFeD09MC45LjMiCi0gICAgICAgIF0sCiAgICAgICAgICI6cHl0aG9u X3ZlcnNpb248PScyLjcnIjogWwogICAgICAgICAgICAgImltcG9ydGxpYj09MS4wLjMiCiAgICAg ICAgIF0sCi0gICAgICAgICI6cHl0aG9uX3ZlcnNpb24+PScyLjcnIjogWwotICAgICAgICAgICAg InBzeWNvcGcyPj0yLjcuNCIsCi0gICAgICAgICAgICAicHl0aG9uLWRhdGV1dGlsPj0yLjcuMSIs Ci0gICAgICAgICAgICAiaHRtbG1pbj09MC4xLjEyIiwKLSAgICAgICAgICAgICJGbGFzay1IVE1M bWluPT0xLjMuMiIsCi0gICAgICAgICAgICAiU1FMQWxjaGVteT49MS4yLjUiLAotICAgICAgICAg ICAgIkZsYXNrLVNlY3VyaXR5Pj0zLjAuMCIsCi0gICAgICAgICAgICAic3NodHVubmVsPj0wLjEu MyIKLSAgICAgICAgXQogICAgIH0sCiAKICAgICAjIFNwZWNpZnkgZGF0YSBmaWxlcyB0byBiZSBp bmNsdWRlZC4KZGlmZiAtLWdpdCBhL3JlcXVpcmVtZW50cy50eHQgYi9yZXF1aXJlbWVudHMudHh0 CmluZGV4IDkyZWFlN2RkLi5lNDIzMjE5MSAxMDA2NDQKLS0tIGEvcmVxdWlyZW1lbnRzLnR4dAor KysgYi9yZXF1aXJlbWVudHMudHh0CkBAIC0yOSwzMCArMjksMTUgQEAgc3FscGFyc2U9PTAuMi40 CiBXVEZvcm1zPT0yLjEKIEZsYXNrLVBhcmFub2lkPT0wLjIuMAogcHN1dGlsPT01LjQuNwotCi0j IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjCi0jIE1vZHVsZXMgc3BlY2lmaWNhbGx5IHJlcXVpcmVzIGZvciBQeXRob24yLjcgb3Ig Z3JlYXRlciB2ZXJzaW9uCi0jIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi1wc3ljb3BnMj49Mi43LjQ7ICAgICAgICAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCi1weXRob24tZGF0ZXV0aWw+PTIuNy4xOyAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCi1odG1sbWluPT0wLjEuMTI7ICAgICAgICAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCi1GbGFzay1IVE1MbWluPT0xLjMuMjsgICAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCi1TUUxBbGNoZW15Pj0xLjIuNTsgICAgICAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCi1GbGFzay1TZWN1cml0eT49My4wLjA7ICAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCi1zc2h0dW5uZWw+PTAuMS4zOyAgICAgICAgICAgICAg IHB5dGhvbl92ZXJzaW9uID49ICcyLjcnCitwc3ljb3BnMj49Mi43LjQKK3B5dGhvbi1kYXRldXRp bD49Mi43LjEKK2h0bWxtaW49PTAuMS4xMgorRmxhc2stSFRNTG1pbj09MS4zLjIKK1NRTEFsY2hl bXk+PTEuMi41CitGbGFzay1TZWN1cml0eT49My4wLjAKK3NzaHR1bm5lbD49MC4xLjMKIAogIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjCi0jIE1vZHVsZXMgc3BlY2lmaWNhbGx5IHJlcXVpcmVkIGZvciBQeXRob24yLjcgb3IgbGVz c2VyIHZlcnNpb24KKyMgTW9kdWxlcyBzcGVjaWZpY2FsbHkgcmVxdWlyZWQgZm9yIFB5dGhvbjIu NwogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjCiBpbXBvcnRsaWI9PTEuMC4zOyAgICAgICAgICAgICAgIHB5dGhvbl92ZXJzaW9u IDw9ICcyLjcnCi0KLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIwotIyBNb2R1bGVzIHJlcXVpcmVkIGZvciBQeXRob24yLjYKLSMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIwotcHN5Y29wZzI9PTIuNy4zLjI7ICAgICAgICAgICAgICBweXRob25fdmVyc2lvbiA8ICcy LjcnCi1GbGFzay1TY3JpcHQ9PTIuMC41OyAgICAgICAgICAgIHB5dGhvbl92ZXJzaW9uIDwgJzIu NycKLW9yZGVyZWRkaWN0OyAgICAgICAgICAgICAgICAgICAgcHl0aG9uX3ZlcnNpb24gPCAnMi43 JwotcHl0aG9uLWRhdGV1dGlsPT0yLjUuMDsgICAgICAgICBweXRob25fdmVyc2lvbiA8ICcyLjcn Ci1TUUxBbGNoZW15PT0xLjAuMTQ7ICAgICAgICAgICAgIHB5dGhvbl92ZXJzaW9uIDwgJzIuNycK LUZsYXNrLVNlY3VyaXR5PT0xLjcuNTsgICAgICAgICAgcHl0aG9uX3ZlcnNpb24gPCAnMi43Jwot Rmxhc2stQmFiZWxFeD09MC45LjM7ICAgICAgICAgICBweXRob25fdmVyc2lvbiA8ICcyLjcnCmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvdGVzdHMvdGVzdF9iYXRjaF9wcm9j ZXNzLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3VwL3Rlc3RzL3Rlc3RfYmF0Y2hfcHJvY2Vz cy5weQppbmRleCA4YTUxYmNlNi4uMTVmYjk0NDggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rv b2xzL2JhY2t1cC90ZXN0cy90ZXN0X2JhdGNoX3Byb2Nlc3MucHkKKysrIGIvd2ViL3BnYWRtaW4v dG9vbHMvYmFja3VwL3Rlc3RzL3Rlc3RfYmF0Y2hfcHJvY2Vzcy5weQpAQCAtMTE5LDEwICsxMTks NyBAQCBjbGFzcyBCYXRjaFByb2Nlc3NUZXN0KEJhc2VUZXN0R2VuZXJhdG9yKToKICAgICAgICAg Y3VycmVudF9hcHBfbW9jay5QR0FETUlOX1JVTlRJTUUgPSBGYWxzZQogCiAgICAgICAgIGRlZiBk Yl9zZXNzaW9uX2FkZF9tb2NrKGopOgotICAgICAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA8 ICgyLCA3KToKLSAgICAgICAgICAgICAgICBjbWRfb2JqID0gbG9hZHMoc3RyKGouZGVzYykpCi0g ICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgIGNtZF9vYmogPSBsb2FkcyhqLmRlc2Mp CisgICAgICAgICAgICBjbWRfb2JqID0gbG9hZHMoai5kZXNjKQogICAgICAgICAgICAgc2VsZi5h c3NlcnRUcnVlKGlzaW5zdGFuY2UoY21kX29iaiwgSVByb2Nlc3NEZXNjKSkKICAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoY21kX29iai5iYWNrdXBfdHlwZSwgc2VsZi5jbGFzc19wYXJhbXNb J3R5cGUnXSkKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY21kX29iai5iZmlsZSwgc2Vs Zi5jbGFzc19wYXJhbXNbJ2JmaWxlJ10pCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9t YWludGVuYW5jZS90ZXN0cy90ZXN0X2JhdGNoX3Byb2Nlc3NfbWFpbnRlbmFuY2UucHkgYi93ZWIv cGdhZG1pbi90b29scy9tYWludGVuYW5jZS90ZXN0cy90ZXN0X2JhdGNoX3Byb2Nlc3NfbWFpbnRl bmFuY2UucHkKaW5kZXggOGEyMzhlN2MuLjI0MjY5OGEyIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi90b29scy9tYWludGVuYW5jZS90ZXN0cy90ZXN0X2JhdGNoX3Byb2Nlc3NfbWFpbnRlbmFuY2Uu cHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvdGVzdHMvdGVzdF9iYXRjaF9w cm9jZXNzX21haW50ZW5hbmNlLnB5CkBAIC03MywxMCArNzMsNyBAQCBjbGFzcyBCYXRjaFByb2Nl c3NUZXN0KEJhc2VUZXN0R2VuZXJhdG9yKToKICAgICAgICAgICAgICAgICBzZWxmLnBvcnQgPSBw b3J0CiAKICAgICAgICAgZGVmIGRiX3Nlc3Npb25fYWRkX21vY2soaik6Ci0gICAgICAgICAgICBp ZiBzeXMudmVyc2lvbl9pbmZvIDwgKDIsIDcpOgotICAgICAgICAgICAgICAgIGNtZF9vYmogPSBs b2FkcyhzdHIoai5kZXNjKSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgY21k X29iaiA9IGxvYWRzKGouZGVzYykKKyAgICAgICAgICAgIGNtZF9vYmogPSBsb2FkcyhqLmRlc2Mp CiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoaXNpbnN0YW5jZShjbWRfb2JqLCBJUHJvY2Vz c0Rlc2MpKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjbWRfb2JqLnF1ZXJ5LCBzZWxm LmNsYXNzX3BhcmFtc1snY21kJ10pCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNtZF9v YmoubWVzc2FnZSwgc2VsZi5leHBlY3RlZF9tc2cpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90 b29scy9yZXN0b3JlL3Rlc3RzL3Rlc3RfYmF0Y2hfcHJvY2Vzcy5weSBiL3dlYi9wZ2FkbWluL3Rv b2xzL3Jlc3RvcmUvdGVzdHMvdGVzdF9iYXRjaF9wcm9jZXNzLnB5CmluZGV4IDY3NGVjYTA3Li4z OTgzNjEzMyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9yZS90ZXN0cy90ZXN0 X2JhdGNoX3Byb2Nlc3MucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvcmVzdG9yZS90ZXN0cy90 ZXN0X2JhdGNoX3Byb2Nlc3MucHkKQEAgLTY0LDEwICs2NCw3IEBAIGNsYXNzIEJhdGNoUHJvY2Vz c1Rlc3QoQmFzZVRlc3RHZW5lcmF0b3IpOgogICAgICAgICBjdXJyZW50X2FwcF9tb2NrLlBHQURN SU5fUlVOVElNRSA9IEZhbHNlCiAKICAgICAgICAgZGVmIGRiX3Nlc3Npb25fYWRkX21vY2soaik6 Ci0gICAgICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvIDwgKDIsIDcpOgotICAgICAgICAgICAg ICAgIGNtZF9vYmogPSBsb2FkcyhzdHIoai5kZXNjKSkKLSAgICAgICAgICAgIGVsc2U6Ci0gICAg ICAgICAgICAgICAgY21kX29iaiA9IGxvYWRzKGouZGVzYykKKyAgICAgICAgICAgIGNtZF9vYmog PSBsb2FkcyhqLmRlc2MpCiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoaXNpbnN0YW5jZShj bWRfb2JqLCBJUHJvY2Vzc0Rlc2MpKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjbWRf b2JqLmJmaWxlLCBzZWxmLmNsYXNzX3BhcmFtc1snYmZpbGUnXSkKICAgICAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoY21kX29iai5jbWQsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi91dGlscy9y b3V0ZS5weSBiL3dlYi9wZ2FkbWluL3V0aWxzL3JvdXRlLnB5CmluZGV4IGU0NWUwNmI3Li5lNjdm MDE5NSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdXRpbHMvcm91dGUucHkKKysrIGIvd2ViL3Bn YWRtaW4vdXRpbHMvcm91dGUucHkKQEAgLTE2LDEwICsxNiw3IEBAIGltcG9ydCBzaXgKIGZyb20g d2Vya3pldWcudXRpbHMgaW1wb3J0IGZpbmRfbW9kdWxlcwogZnJvbSBwZ2FkbWluLnV0aWxzIGlt cG9ydCBzZXJ2ZXJfdXRpbHMKIAotaWYgc3lzLnZlcnNpb25faW5mbyA8ICgyLCA3KToKLSAgICBp bXBvcnQgdW5pdHRlc3QyIGFzIHVuaXR0ZXN0Ci1lbHNlOgotICAgIGltcG9ydCB1bml0dGVzdAor aW1wb3J0IHVuaXR0ZXN0CiAKIAogY2xhc3MgVGVzdHNHZW5lcmF0b3JSZWdpc3RyeShBQkNNZXRh KToKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3V0aWxzL3NxbGF1dG9jb21wbGV0ZS9hdXRvY29t cGxldGUucHkgYi93ZWIvcGdhZG1pbi91dGlscy9zcWxhdXRvY29tcGxldGUvYXV0b2NvbXBsZXRl LnB5CmluZGV4IDRhZDkyOGM3Li5kYTk3ZTYwNyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdXRp bHMvc3FsYXV0b2NvbXBsZXRlL2F1dG9jb21wbGV0ZS5weQorKysgYi93ZWIvcGdhZG1pbi91dGls cy9zcWxhdXRvY29tcGxldGUvYXV0b2NvbXBsZXRlLnB5CkBAIC0xNCwxMSArMTQsNyBAQCBpbXBv cnQgb3BlcmF0b3IKIGltcG9ydCBzeXMKIGZyb20gaXRlcnRvb2xzIGltcG9ydCBjb3VudCwgcmVw ZWF0LCBjaGFpbgogZnJvbSAuY29tcGxldGlvbiBpbXBvcnQgQ29tcGxldGlvbgotZnJvbSBjb2xs ZWN0aW9ucyBpbXBvcnQgbmFtZWR0dXBsZSwgZGVmYXVsdGRpY3QKLWlmIHN5cy52ZXJzaW9uX2lu Zm8gPCAoMiwgNyk6Ci0gICAgZnJvbSBvcmRlcmVkZGljdCBpbXBvcnQgT3JkZXJlZERpY3QKLWVs c2U6Ci0gICAgZnJvbSBjb2xsZWN0aW9ucyBpbXBvcnQgT3JkZXJlZERpY3QKK2Zyb20gY29sbGVj dGlvbnMgaW1wb3J0IG5hbWVkdHVwbGUsIGRlZmF1bHRkaWN0LCBPcmRlcmVkRGljdAogCiBmcm9t IC5zcWxjb21wbGV0aW9uIGltcG9ydCAoCiAgICAgRnJvbUNsYXVzZUl0ZW0sIHN1Z2dlc3RfdHlw ZSwgRGF0YWJhc2UsIFNjaGVtYSwgVGFibGUsCmRpZmYgLS1naXQgYS93ZWIvcmVncmVzc2lvbi9y ZXF1aXJlbWVudHMudHh0IGIvd2ViL3JlZ3Jlc3Npb24vcmVxdWlyZW1lbnRzLnR4dAppbmRleCAy NWJiZTk4OS4uNzcwNDRjMDUgMTAwNjQ0Ci0tLSBhL3dlYi9yZWdyZXNzaW9uL3JlcXVpcmVtZW50 cy50eHQKKysrIGIvd2ViL3JlZ3Jlc3Npb24vcmVxdWlyZW1lbnRzLnR4dApAQCAtMTEsMTcgKzEx LDcgQEAgcHlwZXJjbGlwfj0xLjYuMAogdGVzdHNjZW5hcmlvcz09MC41LjAKIHRlc3R0b29scz09 Mi4zLjAKIHRyYWNlYmFjazI9PTEuNC4wCi11bml0dGVzdDI9PTEuMS4wCi0KLSMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKLSMg TW9kdWxlcyBzcGVjaWZpY2FsbHkgcmVxdWlyZXMgZm9yIFB5dGhvbjIuNyBvciBncmVhdGVyIHZl cnNpb24KLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMKLXNlbGVuaXVtPT0zLjExLjA7IHB5dGhvbl92ZXJzaW9uID49ICcyLjcn Ci0KLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIwotIyBNb2R1bGVzIHJlcXVpcmVkIGZvciBQeXRob24yLjYKLSMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwotc2Vs ZW5pdW09PTMuMy4zOyBweXRob25fdmVyc2lvbiA8ICcyLjcnCitzZWxlbml1bT09My4xMS4wCiAK ICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIwogIyBNb2R1bGVzIHNwZWNpZmljYWxseSByZXF1aXJlZCBmb3IgUHl0aG9uMy4zIG9y IGxlc3NlciB2ZXJzaW9uCmRpZmYgLS1naXQgYS93ZWIvcmVncmVzc2lvbi9ydW50ZXN0cy5weSBi L3dlYi9yZWdyZXNzaW9uL3J1bnRlc3RzLnB5CmluZGV4IGIwMjM3MDNkLi5kOTIwMTU3ZiAxMDA2 NDQKLS0tIGEvd2ViL3JlZ3Jlc3Npb24vcnVudGVzdHMucHkKKysrIGIvd2ViL3JlZ3Jlc3Npb24v cnVudGVzdHMucHkKQEAgLTI1LDEwICsyNSw3IEBAIGZyb20gc2VsZW5pdW0gaW1wb3J0IHdlYmRy aXZlcgogZnJvbSBzZWxlbml1bS53ZWJkcml2ZXIuY2hyb21lLm9wdGlvbnMgaW1wb3J0IE9wdGlv bnMKIGZyb20gc2VsZW5pdW0ud2ViZHJpdmVyLmNvbW1vbi5kZXNpcmVkX2NhcGFiaWxpdGllcyBp bXBvcnQgRGVzaXJlZENhcGFiaWxpdGllcwogCi1pZiBzeXMudmVyc2lvbl9pbmZvIDwgKDIsIDcp OgotICAgIGltcG9ydCB1bml0dGVzdDIgYXMgdW5pdF90ZXN0Ci1lbHNlOgotICAgIGltcG9ydCB1 bml0dGVzdCBhcyB1bml0X3Rlc3QKK2ltcG9ydCB1bml0dGVzdAogCiBpZiBzeXMudmVyc2lvbl9p bmZvWzBdID49IDM6CiAgICAgaW1wb3J0IGJ1aWx0aW5zCkBAIC0xMTksOSArMTE2LDkgQEAgYXBw LlBHQURNSU5fUlVOVElNRSA9IFRydWUKIGlmIGNvbmZpZy5TRVJWRVJfTU9ERSBpcyBUcnVlOgog ICAgIGFwcC5QR0FETUlOX1JVTlRJTUUgPSBGYWxzZQogCi1zZXRhdHRyKHVuaXRfdGVzdC5yZXN1 bHQuVGVzdFJlc3VsdCwgInBhc3NlZCIsIFtdKQorc2V0YXR0cih1bml0dGVzdC5yZXN1bHQuVGVz dFJlc3VsdCwgInBhc3NlZCIsIFtdKQogCi11bml0X3Rlc3QucnVubmVyLlRleHRUZXN0UmVzdWx0 LmFkZFN1Y2Nlc3MgPSB0ZXN0X3V0aWxzLmFkZF9zdWNjZXNzCit1bml0dGVzdC5ydW5uZXIuVGV4 dFRlc3RSZXN1bHQuYWRkU3VjY2VzcyA9IHRlc3RfdXRpbHMuYWRkX3N1Y2Nlc3MKIAogIyBPdmVy cmlkZSBhcHBseV9zY2VuYXJpbyBtZXRob2QgYXMgd2UgbmVlZCBjdXN0b20gdGVzdCBkZXNjcmlw dGlvbi9uYW1lCiBzY2VuYXJpb3MuYXBwbHlfc2NlbmFyaW8gPSB0ZXN0X3V0aWxzLmFwcGx5X3Nj ZW5hcmlvCkBAIC0xNDMsNyArMTQwLDcgQEAgZGVmIGdldF9zdWl0ZShtb2R1bGVfbGlzdCwgdGVz dF9zZXJ2ZXIsIHRlc3RfYXBwX2NsaWVudCwgc2VydmVyX2luZm9ybWF0aW9uLAogICAgIDpydHlw ZTogVGVzdFN1aXRlCiAgICAgIiIiCiAgICAgbW9kdWxlcyA9IFtdCi0gICAgcGdhZG1pbl9zdWl0 ZSA9IHVuaXRfdGVzdC5UZXN0U3VpdGUoKQorICAgIHBnYWRtaW5fc3VpdGUgPSB1bml0dGVzdC5U ZXN0U3VpdGUoKQogCiAgICAgIyBHZXQgdGhlIGVhY2ggdGVzdCBtb2R1bGUgYW5kIGFkZCBpbnRv IGxpc3QKICAgICBmb3Iga2V5LCBrbGFzcyBpbiBtb2R1bGVfbGlzdDoKQEAgLTQyMyw3ICs0MjAs NyBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2VydmVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9jbGllbnQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXJ2ZXJfaW5mb3JtYXRpb24sIHRlc3Rf ZGJfbmFtZSkKLSAgICAgICAgICAgIHRlc3RzID0gdW5pdF90ZXN0LlRleHRUZXN0UnVubmVyKHN0 cmVhbT1zeXMuc3RkZXJyLAorICAgICAgICAgICAgdGVzdHMgPSB1bml0dGVzdC5UZXh0VGVzdFJ1 bm5lcihzdHJlYW09c3lzLnN0ZGVyciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGRlc2NyaXB0aW9ucz1UcnVlLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdmVyYm9zaXR5PTIpLnJ1bihzdWl0ZSkKIApAQCAtNDM0LDcg KzQzMSw3IEBAIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAKICAgICAgICAgICAgICMgU2V0 IGVtcHR5IGxpc3QgZm9yICdwYXNzZWQnIHBhcmFtZXRlciBmb3IgZWFjaCB0ZXN0UnVuLgogICAg ICAgICAgICAgIyBTbyB0aGF0IGl0IHdpbGwgbm90IGFwcGVuZCBzYW1lIHRlc3QgY2FzZSBuYW1l Ci0gICAgICAgICAgICB1bml0X3Rlc3QucmVzdWx0LlRlc3RSZXN1bHQucGFzc2VkID0gW10KKyAg ICAgICAgICAgIHVuaXR0ZXN0LnJlc3VsdC5UZXN0UmVzdWx0LnBhc3NlZCA9IFtdCiAKICAgICAg ICAgICAgIGlmIGxlbihmYWlsZWRfY2FzZXMpID4gMDoKICAgICAgICAgICAgICAgICBmYWlsdXJl ID0gVHJ1ZQotLSAKMi4yMC4xCgo= --000000000000aae3500580b23a76--