225991 2021-05-19 16:29:23 -0700 [webkitcorepy] Add hybridmethod decorator 2021-07-28 19:32:03 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225985 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu slewis webkit-bug-importer oldest_to_newest 1761760 0 jbedard 2021-05-19 16:29:23 -0700 The hybridmethod decorator is similar to the classmethod decorator, except that a hybridmethod can differentiate between it's caller being an instance of a class and it's caller being a type object. 1761761 1 webkit-bug-importer 2021-05-19 16:29:40 -0700 <rdar://problem/78230701> 1761762 2 429111 jbedard 2021-05-19 16:30:44 -0700 Created attachment 429111 Patch 1780265 3 434477 jbedard 2021-07-28 16:56:32 -0700 Created attachment 434477 Patch 1780293 4 434477 dewei_zhu 2021-07-28 18:53:16 -0700 Comment on attachment 434477 Patch r=me 1780295 5 434489 jbedard 2021-07-28 19:03:12 -0700 Created attachment 434489 Patch for landing 1780298 6 ews-feeder 2021-07-28 19:32:02 -0700 Committed r280413 (240053@main): <https://commits.webkit.org/240053@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434489. 429111 2021-05-19 16:30:44 -0700 2021-07-28 16:56:31 -0700 Patch bug-225991-20210519163043.patch text/plain 3178 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NzQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWE4ZDhmYjlkOTNhM2JkZjNjYWE2NjY2N2QwZTdjMWRi NjdjNDQyZi4uOTU2MDg0YmYxNjJlYWYwNTVjOWMwYjZlMjJkZDA3ZDBhOTYxMmVhNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDIxLTA1LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0Y29yZXB5XSBBZGQgaHlicmlkbWV0aG9kIGRlY29yYXRvcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1OTkxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS83ODIzMDcwMT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJr aXRjb3JlcHkvZGVjb3JhdG9ycy5weToKKyAgICAgICAgKGh5YnJpZG1ldGhvZCk6IFNpbWlsYXIg dG8gdGhlICJjbGFzc21ldGhvZCIgZGVjb3JhdG9yLCBleGNlcHQgdGhpcyBkZWNvcmF0b3IgYWxs b3dzIHRoZQorICAgICAgICBkZWNvcmF0ZWQgZnVuY3Rpb25zIHRvIGRpZmZlcmVudGlhdGUgYmV0 d2VlbiBiZWluZyBjYWxsZWQgYnkgdGhlIGNsYXNzIGFuZCBhbiBpbnN0YW5jZQorICAgICAgICBv ZiB0aGUgY2xhc3MuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dl YmtpdGNvcmVweS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEh5 YnJpZCk6CisgICAgICAgIChUZXN0SHlicmlkLmlzX3R5cGUpOgorICAgICAgICAoVGVzdEh5YnJp ZC50ZXN0X3R5cGUpOgorICAgICAgICAoVGVzdEh5YnJpZC50ZXN0X2luc3RhbmNlKToKKwogMjAy MS0wNS0xOCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBD RlN0cmluZ1JlZiBhbmQgTlNTdHJpbmcgc3VwcG9ydCBmcm9tIFN0cmluZ0J1aWxkZXIgaW50byBT dHJpbmdDb25jYXRlbmF0ZUNGCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2RlY29yYXRvcnMucHkgYi9Ub29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2RlY29yYXRvcnMucHkKaW5kZXggZjk4 OGU0YTUzOTBmYWRhYTNiNDY3YTM2OGNmNDBmMjUwM2RlODZlMS4uMTQ1N2UyM2IyMjQxZTBmODlm MzAxMjhjMTgxOWJiNjQxMzBkYmQ2YiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9kZWNvcmF0b3JzLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvZGVjb3JhdG9ycy5weQpA QCAtNjMsMyArNjMsMjEgQEAgY2xhc3MgTWVtb2l6ZShvYmplY3QpOgogICAgIGRlZiBjbGVhcihz ZWxmKToKICAgICAgICAgc2VsZi5fY2FjaGUgPSBkZWZhdWx0ZGljdChkaWN0KQogICAgICAgICBz ZWxmLl9sYXN0X2NhbGxlZCA9IGRlZmF1bHRkaWN0KGRpY3QpCisKKworY2xhc3MgaHlicmlkbWV0 aG9kKG9iamVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZ1bmN0aW9uKToKKyAgICAgICAg c2VsZi5mdW5jdGlvbiA9IGZ1bmN0aW9uCisKKyAgICBkZWYgX19nZXRfXyhzZWxmLCBvYmosIGNs cyk6CisgICAgICAgIGNvbnRleHQgPSBvYmogaWYgb2JqIGlzIG5vdCBOb25lIGVsc2UgY2xzCisK KyAgICAgICAgZGVmIHdyYXBwZXIoKmFyZ3MsICoqa3dhcmdzKToKKyAgICAgICAgICAgIHJldHVy biBzZWxmLmZ1bmN0aW9uKGNvbnRleHQsICphcmdzLCAqKmt3YXJncykKKworICAgICAgICB3cmFw cGVyLl9fbmFtZV9fID0gc2VsZi5mdW5jdGlvbi5fX25hbWVfXworICAgICAgICB3cmFwcGVyLl9f ZG9jX18gPSBzZWxmLmZ1bmN0aW9uLl9fZG9jX18KKyAgICAgICAgd3JhcHBlci5fX2Z1bmNfXyA9 IHdyYXBwZXIuaW1fZnVuYyA9IHNlbGYuZnVuY3Rpb24KKyAgICAgICAgd3JhcHBlci5fX3NlbGZf XyA9IHdyYXBwZXIuaW1fc2VsZiA9IGNvbnRleHQKKworICAgICAgICByZXR1cm4gd3JhcHBlcgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0ZXN0LnB5 CmluZGV4IGQyMDFhZWY0OTkzNjYyNzYwY2I3NGExYzg4ZDJiMTgzYjM4ZTdiZWEuLmY5YzY1MzQ0 MDA0MjFmOGU4ZTFlMjIwZDA1Y2I5ZTE1MjU0NzFiMmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMvZGVjb3JhdG9yc191 bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L3Rlc3RzL2RlY29yYXRvcnNfdW5pdHRlc3QucHkKQEAgLTEyMCwzICsxMjAsMTYg QEAgY2xhc3MgVGVzdE1lbW9pemUodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKFRlc3RNZW1vaXplLmluY3JlbWVudF93aXRoX2FyZyhhcmc9J3gnKSwgMSkKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChUZXN0TWVtb2l6ZS5pbmNyZW1lbnRfd2l0aF9hcmcoYXJn PSd4JyksIDIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdE1lbW9pemUuaW5jcmVtZW50 X3dpdGhfYXJnKGFyZz0neCcsIGNhY2hlZD1UcnVlKSwgMikKKworCitjbGFzcyBUZXN0SHlicmlk KHVuaXR0ZXN0LlRlc3RDYXNlKToKKworICAgIEBkZWNvcmF0b3JzLmh5YnJpZG1ldGhvZAorICAg IGRlZiBpc190eXBlKGNvbnRleHQpOgorICAgICAgICByZXR1cm4gaXNpbnN0YW5jZShjb250ZXh0 LCB0eXBlKQorCisgICAgZGVmIHRlc3RfdHlwZShzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRU cnVlKFRlc3RIeWJyaWQuaXNfdHlwZSgpKQorCisgICAgZGVmIHRlc3RfaW5zdGFuY2Uoc2VsZik6 CisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5pc190eXBlKCkpCg== 434477 2021-07-28 16:56:32 -0700 2021-07-28 19:03:10 -0700 Patch bug-225991-20210728165631.patch text/plain 2957 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDQxMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIxLTA3LTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBBZGQgaHlicmlkbWV0aG9kIGRlY29yYXRvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1OTkxCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODIzMDcwMT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS93ZWJraXRjb3JlcHkvZGVjb3JhdG9ycy5weToKKyAgICAgICAgKGh5YnJpZG1ldGhvZCk6IFNp bWlsYXIgdG8gdGhlICJjbGFzc21ldGhvZCIgZGVjb3JhdG9yLCBleGNlcHQgdGhpcyBkZWNvcmF0 b3IgYWxsb3dzIHRoZQorICAgICAgICBkZWNvcmF0ZWQgZnVuY3Rpb25zIHRvIGRpZmZlcmVudGlh dGUgYmV0d2VlbiBiZWluZyBjYWxsZWQgYnkgdGhlIGNsYXNzIGFuZCBhbiBpbnN0YW5jZQorICAg ICAgICBvZiB0aGUgY2xhc3MuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0ZXN0LnB5OgorICAgICAgICAo VGVzdEh5YnJpZCk6CisgICAgICAgIChUZXN0SHlicmlkLmlzX3R5cGUpOgorICAgICAgICAoVGVz dEh5YnJpZC50ZXN0X3R5cGUpOgorICAgICAgICAoVGVzdEh5YnJpZC50ZXN0X2luc3RhbmNlKToK KwogMjAyMS0wNy0yOCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAg ICAgICAgW2V3cy1idWlsZC53ZWJraXQub3JnXSBWZXJpZnkgR2l0SHViIGludGVncml0eSBpbiBj b21taXQgcXVldWUKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvZGVjb3JhdG9ycy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2RlY29yYXRvcnMucHkJKHJldmlzaW9u IDI4MDQxMCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRj b3JlcHkvZGVjb3JhdG9ycy5weQkod29ya2luZyBjb3B5KQpAQCAtNjQsMyArNjQsMjEgQEAgY2xh c3MgTWVtb2l6ZShvYmplY3QpOgogICAgIGRlZiBjbGVhcihzZWxmKToKICAgICAgICAgc2VsZi5f Y2FjaGUgPSBkZWZhdWx0ZGljdChkaWN0KQogICAgICAgICBzZWxmLl9sYXN0X2NhbGxlZCA9IGRl ZmF1bHRkaWN0KGRpY3QpCisKKworY2xhc3MgaHlicmlkbWV0aG9kKG9iamVjdCk6CisgICAgZGVm IF9faW5pdF9fKHNlbGYsIGZ1bmN0aW9uKToKKyAgICAgICAgc2VsZi5mdW5jdGlvbiA9IGZ1bmN0 aW9uCisKKyAgICBkZWYgX19nZXRfXyhzZWxmLCBvYmosIGNscyk6CisgICAgICAgIGNvbnRleHQg PSBvYmogaWYgb2JqIGlzIG5vdCBOb25lIGVsc2UgY2xzCisKKyAgICAgICAgZGVmIHdyYXBwZXIo KmFyZ3MsICoqa3dhcmdzKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLmZ1bmN0aW9uKGNvbnRl eHQsICphcmdzLCAqKmt3YXJncykKKworICAgICAgICB3cmFwcGVyLl9fbmFtZV9fID0gc2VsZi5m dW5jdGlvbi5fX25hbWVfXworICAgICAgICB3cmFwcGVyLl9fZG9jX18gPSBzZWxmLmZ1bmN0aW9u Ll9fZG9jX18KKyAgICAgICAgd3JhcHBlci5fX2Z1bmNfXyA9IHdyYXBwZXIuaW1fZnVuYyA9IHNl bGYuZnVuY3Rpb24KKyAgICAgICAgd3JhcHBlci5fX3NlbGZfXyA9IHdyYXBwZXIuaW1fc2VsZiA9 IGNvbnRleHQKKworICAgICAgICByZXR1cm4gd3JhcHBlcgpJbmRleDogVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS93ZWJraXRjb3JlcHkvdGVzdHMvZGVjb3JhdG9yc191bml0dGVzdC5weQkocmV2aXNpb24gMjgw NDEwKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVw eS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMjAsMyAr MTIwLDE2IEBAIGNsYXNzIFRlc3RNZW1vaXplKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChUZXN0TWVtb2l6ZS5pbmNyZW1lbnRfd2l0aF9hcmcoYXJnPSd4Jyks IDEpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdE1lbW9pemUuaW5jcmVtZW50X3dpdGhf YXJnKGFyZz0neCcpLCAyKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFRlc3RNZW1vaXplLmlu Y3JlbWVudF93aXRoX2FyZyhhcmc9J3gnLCBjYWNoZWQ9VHJ1ZSksIDIpCisKKworY2xhc3MgVGVz dEh5YnJpZCh1bml0dGVzdC5UZXN0Q2FzZSk6CisKKyAgICBAZGVjb3JhdG9ycy5oeWJyaWRtZXRo b2QKKyAgICBkZWYgaXNfdHlwZShjb250ZXh0KToKKyAgICAgICAgcmV0dXJuIGlzaW5zdGFuY2Uo Y29udGV4dCwgdHlwZSkKKworICAgIGRlZiB0ZXN0X3R5cGUoc2VsZik6CisgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShUZXN0SHlicmlkLmlzX3R5cGUoKSkKKworICAgIGRlZiB0ZXN0X2luc3RhbmNl KHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHNlbGYuaXNfdHlwZSgpKQo= 434489 2021-07-28 19:03:12 -0700 2021-07-28 19:32:02 -0700 Patch for landing bug-225991-20210728190312.patch text/plain 4226 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDQxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDIxLTA3LTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0Y29yZXB5XSBBZGQgaHlicmlkbWV0aG9kIGRlY29yYXRvcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1OTkxCisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83ODIzMDcwMT4KKworICAgICAgICBSZXZpZXdlZCBieSBE ZXdlaSBaaHUuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0 dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2RlY29yYXRvcnMucHk6CisgICAg ICAgIChoeWJyaWRtZXRob2QpOiBTaW1pbGFyIHRvIHRoZSAiY2xhc3NtZXRob2QiIGRlY29yYXRv ciwgZXhjZXB0IHRoaXMgZGVjb3JhdG9yIGFsbG93cyB0aGUKKyAgICAgICAgZGVjb3JhdGVkIGZ1 bmN0aW9ucyB0byBkaWZmZXJlbnRpYXRlIGJldHdlZW4gYmVpbmcgY2FsbGVkIGJ5IHRoZSBjbGFz cyBhbmQgYW4gaW5zdGFuY2UKKyAgICAgICAgb2YgdGhlIGNsYXNzLgorICAgICAgICAqIFNjcmlw dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMvZGVjb3JhdG9yc191 bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RIeWJyaWQpOgorICAgICAgICAoVGVzdEh5YnJpZC5p c190eXBlKToKKyAgICAgICAgKFRlc3RIeWJyaWQudGVzdF90eXBlKToKKyAgICAgICAgKFRlc3RI eWJyaWQudGVzdF9pbnN0YW5jZSk6CisKIDIwMjEtMDctMjggIEpvbmF0aGFuIEJlZGFyZCAgPGpi ZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFt3ZWJraXRjb3JlcHldIEZpeCByYWNlIGNvbmRp dGlvbiBpbiBUYXNrUG9vbCB1bml0dGVzdHMgKGZvbGxvdy11cCBmaXgpCkluZGV4OiBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CShyZXZpc2lvbiAyODA0 MTIpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkJKHdv cmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDcgQEAgZGVmIHJlYWRtZSgpOgogCiBzZXR1cCgKICAg ICBuYW1lPSd3ZWJraXRjb3JlcHknLAotICAgIHZlcnNpb249JzAuNy4xJywKKyAgICB2ZXJzaW9u PScwLjcuMicsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgY29udGFpbmluZyB2YXJpb3VzIFB5 dGhvbiBzdXBwb3J0IGNsYXNzZXMgYW5kIGZ1bmN0aW9ucy4nLAogICAgIGxvbmdfZGVzY3JpcHRp b249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5CShyZXZpc2lvbiAyODA0MTIpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3 ICszOSw3IEBAIGZyb20gd2Via2l0Y29yZXB5LmNyZWRlbnRpYWxzIGltcG9ydCBjcmUKIGZyb20g d2Via2l0Y29yZXB5Lm1lYXN1cmVfdGltZSBpbXBvcnQgTWVhc3VyZVRpbWUKIGZyb20gd2Via2l0 Y29yZXB5Lm5lc3RlZF9mdXp6eV9kaWN0IGltcG9ydCBOZXN0ZWRGdXp6eURpY3QKIAotdmVyc2lv biA9IFZlcnNpb24oMCwgNywgMSkKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDcsIDIpCiAKIGZyb20g d2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYg c3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvZGVjb3JhdG9ycy5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2RlY29yYXRv cnMucHkJKHJldmlzaW9uIDI4MDQxMikKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dGNvcmVweS93ZWJraXRjb3JlcHkvZGVjb3JhdG9ycy5weQkod29ya2luZyBjb3B5KQpAQCAtNjQs MyArNjQsMjEgQEAgY2xhc3MgTWVtb2l6ZShvYmplY3QpOgogICAgIGRlZiBjbGVhcihzZWxmKToK ICAgICAgICAgc2VsZi5fY2FjaGUgPSBkZWZhdWx0ZGljdChkaWN0KQogICAgICAgICBzZWxmLl9s YXN0X2NhbGxlZCA9IGRlZmF1bHRkaWN0KGRpY3QpCisKKworY2xhc3MgaHlicmlkbWV0aG9kKG9i amVjdCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGZ1bmN0aW9uKToKKyAgICAgICAgc2VsZi5m dW5jdGlvbiA9IGZ1bmN0aW9uCisKKyAgICBkZWYgX19nZXRfXyhzZWxmLCBvYmosIGNscyk6Cisg ICAgICAgIGNvbnRleHQgPSBvYmogaWYgb2JqIGlzIG5vdCBOb25lIGVsc2UgY2xzCisKKyAgICAg ICAgZGVmIHdyYXBwZXIoKmFyZ3MsICoqa3dhcmdzKToKKyAgICAgICAgICAgIHJldHVybiBzZWxm LmZ1bmN0aW9uKGNvbnRleHQsICphcmdzLCAqKmt3YXJncykKKworICAgICAgICB3cmFwcGVyLl9f bmFtZV9fID0gc2VsZi5mdW5jdGlvbi5fX25hbWVfXworICAgICAgICB3cmFwcGVyLl9fZG9jX18g PSBzZWxmLmZ1bmN0aW9uLl9fZG9jX18KKyAgICAgICAgd3JhcHBlci5fX2Z1bmNfXyA9IHdyYXBw ZXIuaW1fZnVuYyA9IHNlbGYuZnVuY3Rpb24KKyAgICAgICAgd3JhcHBlci5fX3NlbGZfXyA9IHdy YXBwZXIuaW1fc2VsZiA9IGNvbnRleHQKKworICAgICAgICByZXR1cm4gd3JhcHBlcgpJbmRleDog VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0cy9k ZWNvcmF0b3JzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMvZGVjb3JhdG9yc191bml0dGVzdC5w eQkocmV2aXNpb24gMjgwNDEyKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS90ZXN0cy9kZWNvcmF0b3JzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC0xMjAsMyArMTIwLDE2IEBAIGNsYXNzIFRlc3RNZW1vaXplKHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUZXN0TWVtb2l6ZS5pbmNyZW1lbnRfd2l0 aF9hcmcoYXJnPSd4JyksIDEpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdE1lbW9pemUu aW5jcmVtZW50X3dpdGhfYXJnKGFyZz0neCcpLCAyKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KFRlc3RNZW1vaXplLmluY3JlbWVudF93aXRoX2FyZyhhcmc9J3gnLCBjYWNoZWQ9VHJ1ZSksIDIp CisKKworY2xhc3MgVGVzdEh5YnJpZCh1bml0dGVzdC5UZXN0Q2FzZSk6CisKKyAgICBAZGVjb3Jh dG9ycy5oeWJyaWRtZXRob2QKKyAgICBkZWYgaXNfdHlwZShjb250ZXh0KToKKyAgICAgICAgcmV0 dXJuIGlzaW5zdGFuY2UoY29udGV4dCwgdHlwZSkKKworICAgIGRlZiB0ZXN0X3R5cGUoc2VsZik6 CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShUZXN0SHlicmlkLmlzX3R5cGUoKSkKKworICAgIGRl ZiB0ZXN0X2luc3RhbmNlKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHNlbGYuaXNf dHlwZSgpKQo=