229172 2021-08-16 17:33:18 -0700 [webkitcorepy] Return SourceFileLoader in find_module 2021-08-17 15:16:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226658 InRadar P2 Normal --- 1 jbedard jbedard slewis webkit-bug-importer oldest_to_newest 1784704 0 jbedard 2021-08-16 17:33:18 -0700 On some of our bots, Python 3 scripts are failing because the auto installer is failing to load modules it has installed. This is because we aren't implementing everything required for a custom import system, namely, we should return a module loader. Python 2 doesn't require this, and implementing a module loader in Python 2 is non trivial, and we intend to deprecate Python 2 in the near future. 1784705 1 webkit-bug-importer 2021-08-16 17:33:38 -0700 <rdar://problem/82006256> 1784707 2 435650 jbedard 2021-08-16 17:35:47 -0700 Created attachment 435650 Patch 1784892 3 slewis 2021-08-17 12:13:21 -0700 I don't think we can claim we can deprecate python2 until we stop testing on macOS 10 (at least for stuff engineers might use, I don't care about infra) 1784893 4 jbedard 2021-08-17 12:22:28 -0700 (In reply to Stephanie Lewis from comment #3) > I don't think we can claim we can deprecate python2 until we stop testing on > macOS 10 (at least for stuff engineers might use, I don't care about infra) That's what's weird about this particular case. Python 2 doesn't seem to need it (which is why we aren't having this problem on the bots now). Actually, even Python 3 doesn't seem to always need it in practice, although I'm not entirely sure why, because Python 3's documentation indicates that we always need this. I did look into a Python 2 implementation, but we need SourceFileLoader, which isn't trivial to upload. Since it doesn't seem like we need this in practice, this code works just fine right now with Python 2, I think we can get away with a Python 3 only implementation 1784896 5 435650 slewis 2021-08-17 12:33:47 -0700 Comment on attachment 435650 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435650&action=review > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:603 > + # Python 2 works find with the default module finder, once we've installed the module in question typo fine > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:609 > + for trail in ('', '.py', '.pyc', '.py3', '.pyo'): would ext be a better name than trail? > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:614 > + if not os.path.isdir(part): do you mean path here? 1784898 6 jbedard 2021-08-17 12:37:44 -0700 (In reply to Stephanie Lewis from comment #5) > Comment on attachment 435650 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=435650&action=review > > > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:603 > > + # Python 2 works find with the default module finder, once we've installed the module in question > > typo fine > > > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:609 > > + for trail in ('', '.py', '.pyc', '.py3', '.pyo'): > > would ext be a better name than trail? Yes > > > Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:614 > > + if not os.path.isdir(part): > > do you mean path here? Yes 1784912 7 435704 jbedard 2021-08-17 13:07:53 -0700 Created attachment 435704 Patch 1784943 8 ews-feeder 2021-08-17 14:58:02 -0700 Found 1 new test failure: imported/w3c/web-platform-tests/navigation-timing/nav2_test_attributes_values.html 1784950 9 jbedard 2021-08-17 15:16:22 -0700 Committed r281167 (240614@main): <https://commits.webkit.org/240614@main> 435650 2021-08-16 17:35:47 -0700 2021-08-17 13:07:52 -0700 Patch bug-229172-20210816173546.patch text/plain 4039 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTE4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTExZDQ4N2E1ZDQxMTI1YjM4MDBjZTNiZTZkODVhNTM2 ZGI1ZTM0Mi4uYzYxNTQ5YmI4Y2M4ZGRhYzNhMzk0YjI4N2U5YjcwZTljNGRmNTVjMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA4LTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0Y29yZXB5XSBSZXR1cm4gU291cmNlRmlsZUxvYWRlciBpbiBmaW5kX21v ZHVsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5 MTcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjAwNjI1Nj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHk6CisgICAgICAgIChBdXRvSW5zdGFs bC5maW5kX21vZHVsZSk6IFJldHVybiBTb3VyY2VGaWxlTG9hZGVyIG9iamVjdCBpbiBQeXRob24g My4KKwogMjAyMS0wOC0xNiAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+ CiAKICAgICAgICAgRXhwb3NlIFtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBsaW5lUmVj dHNBbmRUZXh0XSBvbiBNYWNPUy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS9zZXR1cC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNv cmVweS9zZXR1cC5weQppbmRleCA0MDczMGVmOTk1NWM4NTgyYWU3MTVlNGFlZjMwOTc4YThkODNi YmZiLi43NjY4ZjRjZjE3OTYzOTM1NmIzYzJhOGZjNGIzODRkOTA4NDM0Y2I0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0dXAucHkKKysrIGIvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CkBAIC0zMCw3ICszMCw3 IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0Y29yZXB5JywKLSAg ICB2ZXJzaW9uPScwLjguMicsCisgICAgdmVyc2lvbj0nMC44LjMnLAogICAgIGRlc2NyaXB0aW9u PSdMaWJyYXJ5IGNvbnRhaW5pbmcgdmFyaW91cyBQeXRob24gc3VwcG9ydCBjbGFzc2VzIGFuZCBm dW5jdGlvbnMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNsYXNzaWZp ZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5CmluZGV4IDllYTFjMjdiZDg1YWRlYTk2NDhh NTE3OTRmMDk1N2MwODNkYjlmOGQuLjU2NWFkNzUzZGVkZDc3ZTFmYTI0ZjM1ODYyMjRhNDE4MGNi ZTZjNmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQpAQCAtNDAsNyArNDAsNyBAQCBmcm9t IHdlYmtpdGNvcmVweS5jcmVkZW50aWFscyBpbXBvcnQgY3JlZGVudGlhbHMKIGZyb20gd2Via2l0 Y29yZXB5Lm1lYXN1cmVfdGltZSBpbXBvcnQgTWVhc3VyZVRpbWUKIGZyb20gd2Via2l0Y29yZXB5 Lm5lc3RlZF9mdXp6eV9kaWN0IGltcG9ydCBOZXN0ZWRGdXp6eURpY3QKIAotdmVyc2lvbiA9IFZl cnNpb24oMCwgOCwgMikKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDgsIDMpCiAKIGZyb20gd2Via2l0 Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdlLCBBdXRvSW5zdGFsbAogaWYgc3lzLnZl cnNpb25faW5mbyA+ICgzLCAwKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CmluZGV4 IDkzMzkxNzc0NDIzZGFjMmE3N2JhNjA1OTMxM2E4ZTVlYjI5M2FiMWIuLmRjMjdhN2QyMmUzNmFm YTg1YmYyMTU0ZTIwZjA2OWQyOTc1NDdhMDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKKysrIGIvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFs bC5weQpAQCAtNDAsOSArNDAsMTAgQEAgZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGxvZwogZnJv bSB3ZWJraXRjb3JlcHkudmVyc2lvbiBpbXBvcnQgVmVyc2lvbgogCiBpZiBzeXMudmVyc2lvbl9p bmZvID4gKDMsIDApOgorICAgIGZyb20gaHRtbC5wYXJzZXIgaW1wb3J0IEhUTUxQYXJzZXIKKyAg ICBmcm9tIGltcG9ydGxpYiBpbXBvcnQgbWFjaGluZXJ5IGFzIGltcG9ydG1hY2hpbmVyeQogICAg IGZyb20gdXJsbGliLnJlcXVlc3QgaW1wb3J0IHVybG9wZW4KICAgICBmcm9tIHVybGxpYi5lcnJv ciBpbXBvcnQgVVJMRXJyb3IKLSAgICBmcm9tIGh0bWwucGFyc2VyIGltcG9ydCBIVE1MUGFyc2Vy CiBlbHNlOgogICAgIGZyb20gdXJsbGliMiBpbXBvcnQgdXJsb3BlbiwgVVJMRXJyb3IKICAgICBm cm9tIEhUTUxQYXJzZXIgaW1wb3J0IEhUTUxQYXJzZXIKQEAgLTU5MSwxMSArNTkyLDMxIEBAIGNs YXNzIEF1dG9JbnN0YWxsKG9iamVjdCk6CiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGZpbmRf bW9kdWxlKGNscywgZnVsbG5hbWUsIHBhdGg9Tm9uZSk6CiAgICAgICAgIGlmIG5vdCBjbHMuZW5h YmxlZCgpIG9yIHBhdGggaXMgbm90IE5vbmU6Ci0gICAgICAgICAgICByZXR1cm4KKyAgICAgICAg ICAgIHJldHVybiBOb25lCiAKICAgICAgICAgbmFtZSA9IGZ1bGxuYW1lLnNwbGl0KCcuJylbMF0K LSAgICAgICAgaWYgY2xzLnBhY2thZ2VzLmdldChuYW1lKToKLSAgICAgICAgICAgIGNscy5pbnN0 YWxsKG5hbWUpCisgICAgICAgIGlmIG5vdCBjbHMucGFja2FnZXMuZ2V0KG5hbWUpIG9yIG5vdCBj bHMuZGlyZWN0b3J5OgorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICAgICBjbHMuaW5z dGFsbChuYW1lKQorICAgICAgICBpZiBzeXMudmVyc2lvbl9pbmZvIDwgKDMsIDApOgorICAgICAg ICAgICAgIyBQeXRob24gMiB3b3JrcyBmaW5kIHdpdGggdGhlIGRlZmF1bHQgbW9kdWxlIGZpbmRl ciwgb25jZSB3ZSd2ZSBpbnN0YWxsZWQgdGhlIG1vZHVsZSBpbiBxdWVzdGlvbgorICAgICAgICAg ICAgcmV0dXJuIE5vbmUKKworICAgICAgICBwYXRoID0gY2xzLmRpcmVjdG9yeQorICAgICAgICBm b3IgcGFydCBpbiBmdWxsbmFtZS5zcGxpdCgnLicpOgorICAgICAgICAgICAgcGF0aCA9IG9zLnBh dGguam9pbihwYXRoLCBwYXJ0KQorICAgICAgICAgICAgZm9yIHRyYWlsIGluICgnJywgJy5weScs ICcucHljJywgJy5weTMnLCAnLnB5bycpOgorICAgICAgICAgICAgICAgIGNhbmRpZGF0ZSA9ICd7 fXt9Jy5mb3JtYXQocGF0aCwgdHJhaWwpCisgICAgICAgICAgICAgICAgaWYgb3MucGF0aC5leGlz dHMoY2FuZGlkYXRlKToKKyAgICAgICAgICAgICAgICAgICAgcGF0aCA9IGNhbmRpZGF0ZQorICAg ICAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIo cGFydCk6CisgICAgICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgaWYgb3MucGF0aC5pc2Rpcihw YXRoKToKKyAgICAgICAgICAgIHBhdGggPSBvcy5wYXRoLmpvaW4ocGF0aCwgJ19faW5pdF9fLnB5 JykKKworICAgICAgICByZXR1cm4gaW1wb3J0bWFjaGluZXJ5LlNvdXJjZUZpbGVMb2FkZXIobmFt ZSwgcGF0aCkKIAogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiB0YWdzKGNscyk6Cg== 435704 2021-08-17 13:07:53 -0700 2021-08-17 14:58:03 -0700 Patch bug-229172-20210817130753.patch text/plain 4027 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMTU3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzYyNTRiYzU4YWZhN2I5ZWYyN2ZhNmRlZjczNmNlNGQ3 MWY4ZTk0MS4uYTc1NTFhMTMyNTk1NDM3YjZjYmE1NjVhZjgxYTY5ZDg1MTRmZWExNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTA4LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0Y29yZXB5XSBSZXR1cm4gU291cmNlRmlsZUxvYWRlciBpbiBmaW5kX21v ZHVsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5 MTcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84MjAwNjI1Nj4KKworICAgICAgICBSZXZpZXdl ZCBieSBTdGVwaGFuaWUgTGV3aXMuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5OgorICAgICAgICAoQXV0b0luc3Rh bGwuZmluZF9tb2R1bGUpOiBSZXR1cm4gU291cmNlRmlsZUxvYWRlciBvYmplY3QgaW4gUHl0aG9u IDMuCisKIDIwMjEtMDgtMTcgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dMSUJdIEF2b2lkIGdldHRpbmcgc3R1Y2sgc2VhcmNoaW5nIGZvciByZXZpc2lvbiBp biBzb21lIGNhc2VzCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvc2V0dXAucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvc2V0 dXAucHkKaW5kZXggNDA3MzBlZjk5NTVjODU4MmFlNzE1ZTRhZWYzMDk3OGE4ZDgzYmJmYi4uNzY2 OGY0Y2YxNzk2MzkzNTZiM2MyYThmYzRiMzg0ZDkwODQzNGNiNCAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVwLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQpAQCAtMzAsNyArMzAsNyBAQCBkZWYg cmVhZG1lKCk6CiAKIHNldHVwKAogICAgIG5hbWU9J3dlYmtpdGNvcmVweScsCi0gICAgdmVyc2lv bj0nMC44LjInLAorICAgIHZlcnNpb249JzAuOC4zJywKICAgICBkZXNjcmlwdGlvbj0nTGlicmFy eSBjb250YWluaW5nIHZhcmlvdXMgUHl0aG9uIHN1cHBvcnQgY2xhc3NlcyBhbmQgZnVuY3Rpb25z LicsCiAgICAgbG9uZ19kZXNjcmlwdGlvbj1yZWFkbWUoKSwKICAgICBjbGFzc2lmaWVycz1bCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L19faW5pdF9fLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dl YmtpdGNvcmVweS9fX2luaXRfXy5weQppbmRleCA5ZWExYzI3YmQ4NWFkZWE5NjQ4YTUxNzk0ZjA5 NTdjMDgzZGI5ZjhkLi41NjVhZDc1M2RlZGQ3N2UxZmEyNGYzNTg2MjI0YTQxODBjYmU2YzZlIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVw eS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKQEAgLTQwLDcgKzQwLDcgQEAgZnJvbSB3ZWJraXRj b3JlcHkuY3JlZGVudGlhbHMgaW1wb3J0IGNyZWRlbnRpYWxzCiBmcm9tIHdlYmtpdGNvcmVweS5t ZWFzdXJlX3RpbWUgaW1wb3J0IE1lYXN1cmVUaW1lCiBmcm9tIHdlYmtpdGNvcmVweS5uZXN0ZWRf ZnV6enlfZGljdCBpbXBvcnQgTmVzdGVkRnV6enlEaWN0CiAKLXZlcnNpb24gPSBWZXJzaW9uKDAs IDgsIDIpCit2ZXJzaW9uID0gVmVyc2lvbigwLCA4LCAzKQogCiBmcm9tIHdlYmtpdGNvcmVweS5h dXRvaW5zdGFsbCBpbXBvcnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2lu Zm8gPiAoMywgMCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9hdXRvaW5zdGFsbC5weQppbmRleCA5MzM5MTc3 NDQyM2RhYzJhNzdiYTYwNTkzMTNhOGU1ZWIyOTNhYjFiLi4zOGNhYmUzYTc2NWEwYWQ4NGJmNDM5 MDQzYmJjNzkzNjFlMWRjYWYxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2F1dG9pbnN0YWxsLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvYXV0b2luc3RhbGwucHkKQEAg LTQwLDkgKzQwLDEwIEBAIGZyb20gd2Via2l0Y29yZXB5IGltcG9ydCBsb2cKIGZyb20gd2Via2l0 Y29yZXB5LnZlcnNpb24gaW1wb3J0IFZlcnNpb24KIAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgz LCAwKToKKyAgICBmcm9tIGh0bWwucGFyc2VyIGltcG9ydCBIVE1MUGFyc2VyCisgICAgZnJvbSBp bXBvcnRsaWIgaW1wb3J0IG1hY2hpbmVyeSBhcyBpbXBvcnRtYWNoaW5lcnkKICAgICBmcm9tIHVy bGxpYi5yZXF1ZXN0IGltcG9ydCB1cmxvcGVuCiAgICAgZnJvbSB1cmxsaWIuZXJyb3IgaW1wb3J0 IFVSTEVycm9yCi0gICAgZnJvbSBodG1sLnBhcnNlciBpbXBvcnQgSFRNTFBhcnNlcgogZWxzZToK ICAgICBmcm9tIHVybGxpYjIgaW1wb3J0IHVybG9wZW4sIFVSTEVycm9yCiAgICAgZnJvbSBIVE1M UGFyc2VyIGltcG9ydCBIVE1MUGFyc2VyCkBAIC01OTEsMTEgKzU5MiwzMSBAQCBjbGFzcyBBdXRv SW5zdGFsbChvYmplY3QpOgogICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiBmaW5kX21vZHVsZShj bHMsIGZ1bGxuYW1lLCBwYXRoPU5vbmUpOgogICAgICAgICBpZiBub3QgY2xzLmVuYWJsZWQoKSBv ciBwYXRoIGlzIG5vdCBOb25lOgotICAgICAgICAgICAgcmV0dXJuCisgICAgICAgICAgICByZXR1 cm4gTm9uZQogCiAgICAgICAgIG5hbWUgPSBmdWxsbmFtZS5zcGxpdCgnLicpWzBdCi0gICAgICAg IGlmIGNscy5wYWNrYWdlcy5nZXQobmFtZSk6Ci0gICAgICAgICAgICBjbHMuaW5zdGFsbChuYW1l KQorICAgICAgICBpZiBub3QgY2xzLnBhY2thZ2VzLmdldChuYW1lKSBvciBub3QgY2xzLmRpcmVj dG9yeToKKyAgICAgICAgICAgIHJldHVybiBOb25lCisKKyAgICAgICAgY2xzLmluc3RhbGwobmFt ZSkKKyAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAwKToKKyAgICAgICAgICAgICMg UHl0aG9uIDIgd29ya3MgZmluZSB3aXRoIHRoZSBkZWZhdWx0IG1vZHVsZSBmaW5kZXIsIG9uY2Ug d2UndmUgaW5zdGFsbGVkIHRoZSBtb2R1bGUgaW4gcXVlc3Rpb24KKyAgICAgICAgICAgIHJldHVy biBOb25lCisKKyAgICAgICAgcGF0aCA9IGNscy5kaXJlY3RvcnkKKyAgICAgICAgZm9yIHBhcnQg aW4gZnVsbG5hbWUuc3BsaXQoJy4nKToKKyAgICAgICAgICAgIHBhdGggPSBvcy5wYXRoLmpvaW4o cGF0aCwgcGFydCkKKyAgICAgICAgICAgIGZvciBleHQgaW4gKCcnLCAnLnB5JywgJy5weWMnLCAn LnB5MycsICcucHlvJyk6CisgICAgICAgICAgICAgICAgY2FuZGlkYXRlID0gJ3t9e30nLmZvcm1h dChwYXRoLCBleHQpCisgICAgICAgICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMoY2FuZGlkYXRl KToKKyAgICAgICAgICAgICAgICAgICAgcGF0aCA9IGNhbmRpZGF0ZQorICAgICAgICAgICAgICAg ICAgICBicmVhaworICAgICAgICAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIocGF0aCk6CisgICAg ICAgICAgICAgICAgYnJlYWsKKyAgICAgICAgaWYgb3MucGF0aC5pc2RpcihwYXRoKToKKyAgICAg ICAgICAgIHBhdGggPSBvcy5wYXRoLmpvaW4ocGF0aCwgJ19faW5pdF9fLnB5JykKKworICAgICAg ICByZXR1cm4gaW1wb3J0bWFjaGluZXJ5LlNvdXJjZUZpbGVMb2FkZXIobmFtZSwgcGF0aCkKIAog ICAgIEBjbGFzc21ldGhvZAogICAgIGRlZiB0YWdzKGNscyk6Cg==