63419 2011-06-26 22:49:56 -0700 Add encoding parameter to filesystem.py functions 2011-06-28 02:04:05 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 63514 61772 1 rolandsteiner rolandsteiner dominicc dpranke morrita tony oldest_to_newest 427659 0 rolandsteiner 2011-06-26 22:49:56 -0700 Currently, functions to open/read files largely assume 'utf8' as the encoding to use. This should be override-able by the caller. 427701 1 98668 rolandsteiner 2011-06-27 00:02:32 -0700 Created attachment 98668 Patch 427879 2 98668 dominicc 2011-06-27 06:02:21 -0700 Comment on attachment 98668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98668&action=review > Tools/Scripts/webkitpy/common/system/filesystem.py:-199 > - def open_text_file_for_writing(self, path, append=False): There were no callsites hitherto using append? > Tools/Scripts/webkitpy/common/system/filesystem_unittest.py:178 > + fs.write_text_file(text_path, unicode_text_string, encoding='Windows-1252') Python 2.7 documentation seems to indicate that it is little-w windows… how do you know your encoding is working? 428099 3 tony 2011-06-27 11:04:23 -0700 Out of curiosity, what will you be using this for? I just wonder if it would be simpler (less code) for you to manually do the encoding conversion and use read_binary_file/write_binary_file. 428221 4 98668 dpranke 2011-06-27 13:20:31 -0700 Comment on attachment 98668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=98668&action=review These interfaces were intentionally designed so that the caller did not have to worry about the encoding, and that if if a file was being passed to the text versions of these routines, we could be fairly certain it was stored on disk as utf-8. I do not want to lose those principles lightly. Until there's multiple callers that need this functionality, I would prefer it if you just used the read/write_binary_file routines and did the encoding/decoding in the calling routine instead (like Tony suggests). Is that okay? >> Tools/Scripts/webkitpy/common/system/filesystem.py:-199 >> - def open_text_file_for_writing(self, path, append=False): > > There were no callsites hitherto using append? I think that that is correct. I think I added it at one point and ended up not needing it. 428676 5 rolandsteiner 2011-06-28 00:15:54 -0700 (In reply to comment #2) > > Tools/Scripts/webkitpy/common/system/filesystem_unittest.py:178 > > + fs.write_text_file(text_path, unicode_text_string, encoding='Windows-1252') > > Python 2.7 documentation seems to indicate that it is little-w windows… how do you know your encoding is working? Comparison to the expected binary representation seems to work (after the issues from https://bugs.webkit.org/show_bug.cgi?id=63514 have been corrected). (In reply to comment #3) > Out of curiosity, what will you be using this for? I just wonder if it would be simpler (less code) for you to manually do the encoding conversion and use read_binary_file/write_binary_file. This is meant to read/write Visual Studion project files for https://bugs.webkit.org/show_bug.cgi?id=61772 which are encoded in "Windows-1252" (using an upper-case "W" ^_-) (In reply to comment #4) > (From update of attachment 98668 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=98668&action=review > > These interfaces were intentionally designed so that the caller did not have to worry about the encoding, and that if if a file was being passed to the text versions of these routines, we could be fairly certain it was stored on disk as utf-8. I do not want to lose those principles lightly. > > Until there's multiple callers that need this functionality, I would prefer it if you just used the read/write_binary_file routines and did the encoding/decoding in the calling routine instead (like Tony suggests). Is that okay? Sure can do, although I don't see the drawback here. > >> Tools/Scripts/webkitpy/common/system/filesystem.py:-199 > >> - def open_text_file_for_writing(self, path, append=False): > > > > There were no callsites hitherto using append? > > I think that that is correct. I think I added it at one point and ended up not needing it. Yes, I checked all call-sites to make sure it wasn't used, but forgot to document this part of the change. 98668 2011-06-27 00:02:32 -0700 2011-06-27 13:20:31 -0700 Patch bug-63419-20110627160230.patch text/plain 9706 rolandsteiner U3VidmVyc2lvbiBSZXZpc2lvbjogODk3ODAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3ODExYzNmMWY0OGYxMzkxY2VkM2Y2OTkxM2U5YmQ2YjU0 OTUzZTU2Li4zZDk1M2ZjMGEwZTJhMTk5MWExZTQzNmFhNGRjMjZkYWQ2MGEwM2RhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDYtMjYgIFJvbGFuZCBTdGVpbmVyICA8cm9sYW5kc3RlaW5lckBjaHJvbWl1bS5v cmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRk IGVuY29kaW5nIHBhcmFtZXRlciB0byBmaWxlc3lzdGVtLnB5IGZ1bmN0aW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM0MTkKKworICAgICAgICBB ZGQgZW5jb2RpbmcgcGFyYW1ldGVyIHRvIG9wZW4sIHJlYWQgYW5kIHdyaXRlIG1ldGhvZHMgZm9y IHRleHQgZmlsZXMuCisgICAgICAgIE1pcnJvciB0aGUgY2hhbmdlcyBpbiB0aGUgZmlsZXN5c3Rl bSBtb2NrIGNsYXNzLgorICAgICAgICBBZGQgYSB0ZXN0IHRoYXQgcmVhZHMgYW5kIHdyaXRlcyBh IFdpbmRvd3MtMTI1MiBlbmNvZGVkIGZpbGUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX3VuaXR0ZXN0LnB5OgorCiAyMDExLTA2LTI1 ICBOYW9raSBUYWthbm8gIDxob250ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2ZpbGVzeXN0ZW0ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vZmlsZXN5c3RlbS5weQppbmRleCA1MTUwNDA4NTdkMjU5OWExMDdkYjdhMDMxMWVhMThk MDBkNjE0OTg1Li41OTI5NTY0NGIyM2ZiOTZiNGJlYjQwODM2NzRlMGNmZTYyMGUxMTY1IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbS5w eQpAQCAtMTk2LDEyICsxOTYsMTcgQEAgY2xhc3MgRmlsZVN5c3RlbShvYmplY3QpOgogICAgICAg ICBmID0gb3MuZmRvcGVuKHRlbXBfZmQsICd3YicpCiAgICAgICAgIHJldHVybiBmLCB0ZW1wX25h bWUKIAotICAgIGRlZiBvcGVuX3RleHRfZmlsZV9mb3Jfd3JpdGluZyhzZWxmLCBwYXRoLCBhcHBl bmQ9RmFsc2UpOgorICAgIGRlZiBvcGVuX3RleHRfZmlsZV9mb3JfcmVhZGluZyhzZWxmLCBwYXRo LCBlbmNvZGluZz1Ob25lKToKKyAgICAgICAgIiIiUmV0dXJucyBhIGZpbGUgaGFuZGxlIHN1aXRh YmxlIGZvciByZWFkaW5nIGZyb20uIiIiCisgICAgICAgIHJldHVybiBjb2RlY3Mub3BlbihwYXRo LCAncicsIGVuY29kaW5nIG9yICd1dGY4JykKKworICAgIGRlZiBvcGVuX3RleHRfZmlsZV9mb3Jf d3JpdGluZyhzZWxmLCBwYXRoLCBlbmNvZGluZz1Ob25lKToKICAgICAgICAgIiIiUmV0dXJucyBh IGZpbGUgaGFuZGxlIHN1aXRhYmxlIGZvciB3cml0aW5nIHRvLiIiIgotICAgICAgICBtb2RlID0g J3cnCi0gICAgICAgIGlmIGFwcGVuZDoKLSAgICAgICAgICAgIG1vZGUgPSAnYScKLSAgICAgICAg cmV0dXJuIGNvZGVjcy5vcGVuKHBhdGgsIG1vZGUsICd1dGY4JykKKyAgICAgICAgcmV0dXJuIGNv ZGVjcy5vcGVuKHBhdGgsICd3JywgZW5jb2Rpbmcgb3IgJ3V0ZjgnKQorCisgICAgZGVmIG9wZW5f dGV4dF9maWxlX2Zvcl9hcHBlbmRpbmcoc2VsZiwgcGF0aCwgZW5jb2Rpbmc9Tm9uZSk6CisgICAg ICAgICIiIlJldHVybnMgYSBmaWxlIGhhbmRsZSBzdWl0YWJsZSBmb3IgYXBwZW5kaW5nIHRvLiIi IgorICAgICAgICByZXR1cm4gY29kZWNzLm9wZW4ocGF0aCwgJ2EnLCBlbmNvZGluZyBvciAndXRm OCcpCiAKICAgICBkZWYgb3Blbl9iaW5hcnlfZmlsZV9mb3JfcmVhZGluZyhzZWxmLCBwYXRoKToK ICAgICAgICAgcmV0dXJuIGNvZGVjcy5vcGVuKHBhdGgsICdyYicpCkBAIC0yMTEsMTEgKzIxNiwx MSBAQCBjbGFzcyBGaWxlU3lzdGVtKG9iamVjdCk6CiAgICAgICAgIHdpdGggZmlsZShwYXRoLCAn cmInKSBhcyBmOgogICAgICAgICAgICAgcmV0dXJuIGYucmVhZCgpCiAKLSAgICBkZWYgcmVhZF90 ZXh0X2ZpbGUoc2VsZiwgcGF0aCk6CisgICAgZGVmIHJlYWRfdGV4dF9maWxlKHNlbGYsIHBhdGgs IGVuY29kaW5nPU5vbmUpOgogICAgICAgICAiIiJSZXR1cm4gdGhlIGNvbnRlbnRzIG9mIHRoZSBm aWxlIGF0IHRoZSBnaXZlbiBwYXRoIGFzIGEgVW5pY29kZSBzdHJpbmcuCiAKICAgICAgICAgVGhl IGZpbGUgaXMgcmVhZCBhc3N1bWluZyBpdCBpcyBhIFVURi04IGVuY29kZWQgZmlsZSB3aXRoIG5v IEJPTS4iIiIKLSAgICAgICAgd2l0aCBjb2RlY3Mub3BlbihwYXRoLCAncicsICd1dGY4JykgYXMg ZjoKKyAgICAgICAgd2l0aCBjb2RlY3Mub3BlbihwYXRoLCAncicsIGVuY29kaW5nIG9yICd1dGY4 JykgYXMgZjoKICAgICAgICAgICAgIHJldHVybiBmLnJlYWQoKQogCiAgICAgZGVmIHJlbHBhdGgo c2VsZiwgcGF0aCwgc3RhcnQ9Jy4nKToKQEAgLTI1NiwxMSArMjYxLDExIEBAIGNsYXNzIEZpbGVT eXN0ZW0ob2JqZWN0KToKICAgICAgICAgd2l0aCBmaWxlKHBhdGgsICdyYicpIGFzIGY6CiAgICAg ICAgICAgICByZXR1cm4gZi5yZWFkKCkKIAotICAgIGRlZiByZWFkX3RleHRfZmlsZShzZWxmLCBw YXRoKToKKyAgICBkZWYgcmVhZF90ZXh0X2ZpbGUoc2VsZiwgcGF0aCwgZW5jb2Rpbmc9Tm9uZSk6 CiAgICAgICAgICIiIlJldHVybiB0aGUgY29udGVudHMgb2YgdGhlIGZpbGUgYXQgdGhlIGdpdmVu IHBhdGggYXMgYSBVbmljb2RlIHN0cmluZy4KIAogICAgICAgICBUaGUgZmlsZSBpcyByZWFkIGFz c3VtaW5nIGl0IGlzIGEgVVRGLTggZW5jb2RlZCBmaWxlIHdpdGggbm8gQk9NLiIiIgotICAgICAg ICB3aXRoIGNvZGVjcy5vcGVuKHBhdGgsICdyJywgJ3V0ZjgnKSBhcyBmOgorICAgICAgICB3aXRo IGNvZGVjcy5vcGVuKHBhdGgsICdyJywgZW5jb2Rpbmcgb3IgJ3V0ZjgnKSBhcyBmOgogICAgICAg ICAgICAgcmV0dXJuIGYucmVhZCgpCiAKICAgICBkZWYgc3BsaXQoc2VsZiwgcGF0aCk6CkBAIC0y NzYsOSArMjgxLDkgQEAgY2xhc3MgRmlsZVN5c3RlbShvYmplY3QpOgogICAgICAgICB3aXRoIGZp bGUocGF0aCwgJ3diJykgYXMgZjoKICAgICAgICAgICAgIGYud3JpdGUoY29udGVudHMpCiAKLSAg ICBkZWYgd3JpdGVfdGV4dF9maWxlKHNlbGYsIHBhdGgsIGNvbnRlbnRzKToKKyAgICBkZWYgd3Jp dGVfdGV4dF9maWxlKHNlbGYsIHBhdGgsIGNvbnRlbnRzLCBlbmNvZGluZz1Ob25lKToKICAgICAg ICAgIiIiV3JpdGUgdGhlIGNvbnRlbnRzIHRvIHRoZSBmaWxlIGF0IHRoZSBnaXZlbiBsb2NhdGlv bi4KIAogICAgICAgICBUaGUgZmlsZSBpcyB3cml0dGVuIGVuY29kZWQgYXMgVVRGLTggd2l0aCBu byBCT00uIiIiCi0gICAgICAgIHdpdGggY29kZWNzLm9wZW4ocGF0aCwgJ3cnLCAndXRmOCcpIGFz IGY6CisgICAgICAgIHdpdGggY29kZWNzLm9wZW4ocGF0aCwgJ3cnLCBlbmNvZGluZyBvciAndXRm OCcpIGFzIGY6CiAgICAgICAgICAgICBmLndyaXRlKGNvbnRlbnRzKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX21vY2sucHkKaW5k ZXggODU0NzYzMTgxODZkODYzZjIwYjBhODg5Y2Q3YjdjMjM5YjRiOGMyZS4uYjgzNDBhZTEyMDUy MTNhMDQ0ODZiYTZkN2Q4ZWNmY2M0NGZlOTIzZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL2ZpbGVzeXN0ZW1fbW9jay5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV9tb2NrLnB5CkBAIC0yMzgsMTgg KzIzOCwyNCBAQCBjbGFzcyBNb2NrRmlsZVN5c3RlbShvYmplY3QpOgogCiAgICAgZGVmIG9wZW5f YmluYXJ5X3RlbXBmaWxlKHNlbGYsIHN1ZmZpeD0nJyk6CiAgICAgICAgIHBhdGggPSBzZWxmLl9t a3RlbXAoc3VmZml4KQotICAgICAgICByZXR1cm4gKFdyaXRhYmxlRmlsZU9iamVjdChzZWxmLCBw YXRoKSwgcGF0aCkKKyAgICAgICAgcmV0dXJuIChXcml0YWJsZUJpbmFyeUZpbGVPYmplY3Qoc2Vs ZiwgcGF0aCksIHBhdGgpCiAKLSAgICBkZWYgb3Blbl90ZXh0X2ZpbGVfZm9yX3dyaXRpbmcoc2Vs ZiwgcGF0aCwgYXBwZW5kPUZhbHNlKToKLSAgICAgICAgcmV0dXJuIFdyaXRhYmxlRmlsZU9iamVj dChzZWxmLCBwYXRoLCBhcHBlbmQpCisgICAgZGVmIG9wZW5fdGV4dF9maWxlX2Zvcl9yZWFkaW5n KHNlbGYsIHBhdGgsIGVuY29kaW5nPU5vbmUpOgorICAgICAgICByZXR1cm4gUmVhZGFibGVUZXh0 RmlsZU9iamVjdChzZWxmLCBwYXRoLCBlbmNvZGluZyBvciAidXRmOCIpCiAKLSAgICBkZWYgcmVh ZF90ZXh0X2ZpbGUoc2VsZiwgcGF0aCk6Ci0gICAgICAgIHJldHVybiBzZWxmLnJlYWRfYmluYXJ5 X2ZpbGUocGF0aCkuZGVjb2RlKCd1dGYtOCcpCisgICAgZGVmIG9wZW5fdGV4dF9maWxlX2Zvcl93 cml0aW5nKHNlbGYsIHBhdGgsIGVuY29kaW5nPU5vbmUpOgorICAgICAgICByZXR1cm4gV3JpdGFi bGVUZXh0RmlsZU9iamVjdChzZWxmLCBwYXRoLCBGYWxzZSwgZW5jb2Rpbmcgb3IgInV0ZjgiKQor CisgICAgZGVmIG9wZW5fdGV4dF9maWxlX2Zvcl9hcHBlbmRpbmcoc2VsZiwgcGF0aCwgZW5jb2Rp bmc9Tm9uZSk6CisgICAgICAgIHJldHVybiBXcml0YWJsZVRleHRGaWxlT2JqZWN0KHNlbGYsIHBh dGgsIFRydWUsIGVuY29kaW5nIG9yICJ1dGY4IikKKworICAgIGRlZiByZWFkX3RleHRfZmlsZShz ZWxmLCBwYXRoLCBlbmNvZGluZz1Ob25lKToKKyAgICAgICAgcmV0dXJuIHNlbGYucmVhZF9iaW5h cnlfZmlsZShwYXRoKS5kZWNvZGUoZW5jb2Rpbmcgb3IgInV0ZjgiKQogCiAgICAgZGVmIG9wZW5f YmluYXJ5X2ZpbGVfZm9yX3JlYWRpbmcoc2VsZiwgcGF0aCk6CiAgICAgICAgIGlmIHNlbGYuZmls ZXNbcGF0aF0gaXMgTm9uZToKICAgICAgICAgICAgIHNlbGYuX3JhaXNlX25vdF9mb3VuZChwYXRo KQotICAgICAgICByZXR1cm4gUmVhZGFibGVGaWxlT2JqZWN0KHNlbGYsIHBhdGgsIHNlbGYuZmls ZXNbcGF0aF0pCisgICAgICAgIHJldHVybiBSZWFkYWJsZUJpbmFyeUZpbGVPYmplY3Qoc2VsZiwg cGF0aCwgc2VsZi5maWxlc1twYXRoXSkKIAogICAgIGRlZiByZWFkX2JpbmFyeV9maWxlKHNlbGYs IHBhdGgpOgogICAgICAgICAjIEludGVudGlvbmFsbHkgcmFpc2VzIEtleUVycm9yIGlmIHdlIGRv bid0IHJlY29nbml6ZSB0aGUgcGF0aC4KQEAgLTI4OSwxNiArMjk1LDE2IEBAIGNsYXNzIE1vY2tG aWxlU3lzdGVtKG9iamVjdCk6CiAgICAgICAgICAgICBpZHggPSAwCiAgICAgICAgIHJldHVybiAo cGF0aFswOmlkeF0sIHBhdGhbaWR4Ol0pCiAKLSAgICBkZWYgd3JpdGVfdGV4dF9maWxlKHNlbGYs IHBhdGgsIGNvbnRlbnRzKToKLSAgICAgICAgcmV0dXJuIHNlbGYud3JpdGVfYmluYXJ5X2ZpbGUo cGF0aCwgY29udGVudHMuZW5jb2RlKCd1dGYtOCcpKQorICAgIGRlZiB3cml0ZV90ZXh0X2ZpbGUo c2VsZiwgcGF0aCwgY29udGVudHMsIGVuY29kaW5nPU5vbmUpOgorICAgICAgICByZXR1cm4gc2Vs Zi53cml0ZV9iaW5hcnlfZmlsZShwYXRoLCBjb250ZW50cy5lbmNvZGUoZW5jb2Rpbmcgb3IgInV0 ZjgiKSkKIAogICAgIGRlZiB3cml0ZV9iaW5hcnlfZmlsZShzZWxmLCBwYXRoLCBjb250ZW50cyk6 CiAgICAgICAgIHNlbGYuZmlsZXNbcGF0aF0gPSBjb250ZW50cwogICAgICAgICBzZWxmLndyaXR0 ZW5fZmlsZXNbcGF0aF0gPSBjb250ZW50cwogCiAKLWNsYXNzIFdyaXRhYmxlRmlsZU9iamVjdChv YmplY3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBmcywgcGF0aCwgYXBwZW5kPUZhbHNlLCBl bmNvZGluZz1Ob25lKToKK2NsYXNzIFdyaXRhYmxlQmluYXJ5RmlsZU9iamVjdChvYmplY3QpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBmcywgcGF0aCwgYXBwZW5kPUZhbHNlKToKICAgICAgICAg c2VsZi5mcyA9IGZzCiAgICAgICAgIHNlbGYucGF0aCA9IHBhdGgKICAgICAgICAgc2VsZi5jbG9z ZWQgPSBGYWxzZQpAQCAtMzE5LDcgKzMyNSwxNyBAQCBjbGFzcyBXcml0YWJsZUZpbGVPYmplY3Qo b2JqZWN0KToKICAgICAgICAgc2VsZi5mcy53cml0dGVuX2ZpbGVzW3NlbGYucGF0aF0gPSBzZWxm LmZzLmZpbGVzW3NlbGYucGF0aF0KIAogCi1jbGFzcyBSZWFkYWJsZUZpbGVPYmplY3Qob2JqZWN0 KToKK2NsYXNzIFdyaXRhYmxlVGV4dEZpbGVPYmplY3QoV3JpdGFibGVCaW5hcnlGaWxlT2JqZWN0 KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZnMsIHBhdGgsIGFwcGVuZD1GYWxzZSwgZW5jb2Rp bmc9Tm9uZSk6CisgICAgICAgIFdyaXRhYmxlQmluYXJ5RmlsZU9iamVjdC5fX2luaXRfXyhzZWxm LCBmcywgcGF0aCwgYXBwZW5kKQorICAgICAgICBzZWxmLmVuY29kaW5nID0gZW5jb2Rpbmcgb3Ig InV0ZjgiCisKKyAgICBkZWYgd3JpdGUoc2VsZiwgc3RyKToKKyAgICAgICAgc2VsZi5mcy5maWxl c1tzZWxmLnBhdGhdICs9IHN0ci5lbmNvZGUoc2VsZi5lbmNvZGluZykKKyAgICAgICAgc2VsZi5m cy53cml0dGVuX2ZpbGVzW3NlbGYucGF0aF0gPSBzZWxmLmZzLmZpbGVzW3NlbGYucGF0aF0KKwor CitjbGFzcyBSZWFkYWJsZUJpbmFyeUZpbGVPYmplY3Qob2JqZWN0KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgZnMsIHBhdGgsIGRhdGE9IiIpOgogICAgICAgICBzZWxmLmZzID0gZnMKICAgICAg ICAgc2VsZi5wYXRoID0gcGF0aApAQCAtMzQyLDMgKzM1OCwxNiBAQCBjbGFzcyBSZWFkYWJsZUZp bGVPYmplY3Qob2JqZWN0KToKICAgICAgICAgc3RhcnQgPSBzZWxmLm9mZnNldAogICAgICAgICBz ZWxmLm9mZnNldCArPSBieXRlcwogICAgICAgICByZXR1cm4gc2VsZi5kYXRhW3N0YXJ0OnNlbGYu b2Zmc2V0XQorCisKK2NsYXNzIFJlYWRhYmxlVGV4dEZpbGVPYmplY3QoUmVhZGFibGVCaW5hcnlG aWxlT2JqZWN0KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZnMsIHBhdGgsIGRhdGE9IiIsIGVu Y29kaW5nPU5vbmUpOgorICAgICAgICBSZWFkYWJsZUJpbmFyeUZpbGVPYmplY3QuX19pbml0X18o c2VsZiwgZnMsIHBhdGgsIGRhdGEpCisgICAgICAgIHNlbGYuZW5jb2RpbmcgPSBlbmNvZGluZyBv ciAidXRmOCIKKworICAgIGRlZiByZWFkKHNlbGYsIGJ5dGVzPU5vbmUpOgorICAgICAgICBpZiBu b3QgYnl0ZXM6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5kYXRhW3NlbGYub2Zmc2V0Ol0uZGVj b2RlKHNlbGYuZW5jb2RpbmcpCisgICAgICAgIHN0YXJ0ID0gc2VsZi5vZmZzZXQKKyAgICAgICAg c2VsZi5vZmZzZXQgKz0gYnl0ZXMKKyAgICAgICAgcmV0dXJuIHNlbGYuZGF0YVtzdGFydDpzZWxm Lm9mZnNldF0uZGVjb2RlKHNlbGYuZW5jb2RpbmcpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZmlsZXN5c3RlbV91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX3VuaXR0ZXN0LnB5CmluZGV4 IDhkNGYwY2I2MzhiZGRkNDFhOGVkZmVjOTllOGZkNzgwMWY4YmMwMzUuLmY2NzNjN2FjYWU5N2Vk M2E2NTYyMTU3MjVlZjRiYzBjOTcyMjY3Y2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlc3lzdGVtX3VuaXR0ZXN0LnB5CkBAIC0x NTYsNyArMTU2LDcgQEAgY2xhc3MgRmlsZVN5c3RlbVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICAgICAgY29udGVudHMgPSBmcy5yZWFkX2JpbmFyeV9maWxlKHRleHRfcGF0aCkKICAg ICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29udGVudHMsIGhleF9lcXVpdmFsZW50KQogCi0g ICAgICAgICAgICBmcy53cml0ZV90ZXh0X2ZpbGUoYmluYXJ5X3BhdGgsIGhleF9lcXVpdmFsZW50 KQorICAgICAgICAgICAgZnMud3JpdGVfYmluYXJ5X2ZpbGUoYmluYXJ5X3BhdGgsIGhleF9lcXVp dmFsZW50KQogICAgICAgICAgICAgdGV4dF9jb250ZW50cyA9IGZzLnJlYWRfdGV4dF9maWxlKGJp bmFyeV9wYXRoKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0ZXh0X2NvbnRlbnRzLCB1 bmljb2RlX3RleHRfc3RyaW5nKQogICAgICAgICBleGNlcHQ6CkBAIC0xNjUsNiArMTY1LDI5IEBA IGNsYXNzIEZpbGVTeXN0ZW1UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIGlm IGJpbmFyeV9wYXRoOgogICAgICAgICAgICAgICAgIG9zLnJlbW92ZShiaW5hcnlfcGF0aCkKIAor ICAgIGRlZiB0ZXN0X3JlYWRfYW5kX3dyaXRlX2ZpbGVfd2l0aF9lbmNvZGluZyhzZWxmKToKKyAg ICAgICAgZnMgPSBGaWxlU3lzdGVtKCkKKyAgICAgICAgdGV4dF9wYXRoID0gTm9uZQorICAgICAg ICBiaW5hcnlfcGF0aCA9IE5vbmUKKworICAgICAgICB1bmljb2RlX3RleHRfc3RyaW5nID0gdSfD m27Dr2PDtWTDqCcKKyAgICAgICAgaGV4X2VxdWl2YWxlbnQgPSAnXHhEQm5ceEVGY1x4RjVkXHhF OCcKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgdGV4dF9wYXRoID0gdGVtcGZpbGUubWt0ZW1w KHByZWZpeD0ndHJlZV91bml0dGVzdF8nKQorICAgICAgICAgICAgYmluYXJ5X3BhdGggPSB0ZW1w ZmlsZS5ta3RlbXAocHJlZml4PSd0cmVlX3VuaXR0ZXN0XycpCisgICAgICAgICAgICBmcy53cml0 ZV90ZXh0X2ZpbGUodGV4dF9wYXRoLCB1bmljb2RlX3RleHRfc3RyaW5nLCBlbmNvZGluZz0nV2lu ZG93cy0xMjUyJykKKyAgICAgICAgICAgIGNvbnRlbnRzID0gZnMucmVhZF9iaW5hcnlfZmlsZSh0 ZXh0X3BhdGgpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnRlbnRzLCBoZXhfZXF1 aXZhbGVudCkKKworICAgICAgICAgICAgZnMud3JpdGVfYmluYXJ5X2ZpbGUoYmluYXJ5X3BhdGgs IGhleF9lcXVpdmFsZW50KQorICAgICAgICAgICAgdGV4dF9jb250ZW50cyA9IGZzLnJlYWRfdGV4 dF9maWxlKGJpbmFyeV9wYXRoLCBlbmNvZGluZz0nV2luZG93cy0xMjUyJykKKyAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwodGV4dF9jb250ZW50cywgdW5pY29kZV90ZXh0X3N0cmluZykKKyAg ICAgICAgZXhjZXB0OgorICAgICAgICAgICAgaWYgdGV4dF9wYXRoOgorICAgICAgICAgICAgICAg IG9zLnJlbW92ZSh0ZXh0X3BhdGgpCisgICAgICAgICAgICBpZiBiaW5hcnlfcGF0aDoKKyAgICAg ICAgICAgICAgICBvcy5yZW1vdmUoYmluYXJ5X3BhdGgpCisKICAgICBkZWYgdGVzdF9yZWFkX2Jp bmFyeV9maWxlX19taXNzaW5nKHNlbGYpOgogICAgICAgICBmcyA9IEZpbGVTeXN0ZW0oKQogICAg ICAgICBzZWxmLmFzc2VydFJhaXNlcyhJT0Vycm9yLCBmcy5yZWFkX2JpbmFyeV9maWxlLCBzZWxm Ll9taXNzaW5nX2ZpbGUpCg==