180772 2017-12-13 15:20:45 -0800 webkitpy: Replace Version.contained_in with Version.__contains__ 2017-12-14 17:46:47 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard commit-queue ddkilzer dean_johnson ews-watchlist glenn lforschler webkit-bug-importer oldest_to_newest 1381316 0 jbedard 2017-12-13 15:20:45 -0800 Dean Johnson pointed out that __contains__ is more Pythonic than the function contained_in. Note that this function had to be reversed for this. self is now the container. 1381317 1 webkit-bug-importer 2017-12-13 15:21:45 -0800 <rdar://problem/36033555> 1381319 2 329267 jbedard 2017-12-13 15:26:09 -0800 Created attachment 329267 Patch 1381898 3 329267 ddkilzer 2017-12-14 16:23:44 -0800 Comment on attachment 329267 Patch r=me 1381952 4 329267 commit-queue 2017-12-14 17:46:46 -0800 Comment on attachment 329267 Patch Clearing flags on attachment: 329267 Committed r225953: <https://trac.webkit.org/changeset/225953> 1381953 5 commit-queue 2017-12-14 17:46:47 -0800 All reviewed patches have been landed. Closing bug. 329267 2017-12-13 15:26:09 -0800 2017-12-14 17:46:46 -0800 Patch bug-180772-20171213152609.patch text/plain 5324 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNTg3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE3LTEyLTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVwbGFjZSBWZXJzaW9uLmNvbnRhaW5lZF9pbiB3aXRo IFZlcnNpb24uX19jb250YWluc19fCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODA3NzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2MDMzNTU1Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIF9f Y29udGFpbnNfXyBpbnN0ZWFkIG9mIGNvbnRhaW5lZF9pbiBhbGxvd3MgZm9yIHRoZSBtb3JlCisg ICAgICAgIFB5dGhvbmljICdpbicgb3BlcmF0b3IgdG8gYmUgdXNlZC4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL3ZlcnNpb24ucHk6CisgICAgICAgIChWZXJzaW9uKToKKyAg ICAgICAgKFZlcnNpb24uX19jb250YWluc19fKTogUmVwbGFjZSBjb250YWluZWRfaW4uIE5vdGUg dGhhdCBzZWxmIGlzIG5vdworICAgICAgICB0aGUgY29udGFpbmVyLgorICAgICAgICAoVmVyc2lv bi5jb250YWluZWRfaW4pOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL3ZlcnNpb25fbmFtZV9tYXAucHk6CisgICAgICAgIChWZXJzaW9uTmFtZU1hcC50b19uYW1l KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi92ZXJzaW9uX3VuaXR0ZXN0LnB5 OgorICAgICAgICAoVmVyc2lvblRlc3RDYXNlLnRlc3RfY29udGFpbmVkX2luKToKKwogMjAxNy0x Mi0xMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRl IENvbnRlbnRGaWx0ZXJpbmcuTGF6aWx5TG9hZFBsYXRmb3JtRnJhbWV3b3JrcyB0ZXN0IHRvIGFj Y291bnQgZm9yIGxpYndlYnJ0YyB1c2luZyBWaWRlb1Byb2Nlc3NpbmcgZnJhbWV3b3JrCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi92ZXJzaW9uLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ZlcnNpb24ucHkJKHJldmlzaW9uIDIyNTg1 OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3ZlcnNpb24ucHkJKHdvcmtpbmcg Y29weSkKQEAgLTk1LDEzICs5NSwxNCBAQCBjbGFzcyBWZXJzaW9uKG9iamVjdCk6CiAgICAgICAg ICAgICByYWlzZSBWYWx1ZUVycm9yKCdWZXJzaW9uIGtleSBtdXN0IGJlIG1ham9yLCBtaW5vciwg dGlueSwgbWljcm8gb3IgbmFubycpCiAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoJ0V4cGVjdGVk IHZlcnNpb24ga2V5IHRvIGJlIHN0cmluZyBvciBpbnRlZ2VyJykKIAotICAgICMgMTEuMiBpcyBj b250YWluZWQgaW4gMTEsIGJ1dCAxMSBpcyBub3QgY29udGFpbmVkIGluIDExLjIKLSAgICBkZWYg Y29udGFpbmVkX2luKHNlbGYsIHZlcnNpb24pOgorICAgICMgMTEuMiBpcyBpbiAxMSwgYnV0IDEx IGlzIG5vdCBpbiAxMS4yCisgICAgZGVmIF9fY29udGFpbnNfXyhzZWxmLCB2ZXJzaW9uKToKKyAg ICAgICAgYXNzZXJ0IGlzaW5zdGFuY2UodmVyc2lvbiwgVmVyc2lvbikKICAgICAgICAgZG9lc19t YXRjaCA9IFRydWUKLSAgICAgICAgZm9yIGkgaW4geHJhbmdlKGxlbihzZWxmKSk6CisgICAgICAg IGZvciBpIGluIHhyYW5nZShsZW4odmVyc2lvbikpOgogICAgICAgICAgICAgaWYgc2VsZltpXSAh PSB2ZXJzaW9uW2ldOgogICAgICAgICAgICAgICAgIGRvZXNfbWF0Y2ggPSBGYWxzZQotICAgICAg ICAgICAgaWYgbm90IGRvZXNfbWF0Y2ggYW5kIHZlcnNpb25baV0gIT0gMDoKKyAgICAgICAgICAg IGlmIG5vdCBkb2VzX21hdGNoIGFuZCBzZWxmW2ldICE9IDA6CiAgICAgICAgICAgICAgICAgcmV0 dXJuIEZhbHNlCiAgICAgICAgIHJldHVybiBUcnVlCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3ZlcnNpb25fbmFtZV9tYXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vdmVyc2lvbl9uYW1lX21hcC5weQkocmV2aXNpb24gMjI1ODU5 KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vdmVyc2lvbl9uYW1lX21hcC5weQko d29ya2luZyBjb3B5KQpAQCAtOTEsOCArOTEsOCBAQCBjbGFzcyBWZXJzaW9uTmFtZU1hcChvYmpl Y3QpOgogICAgICAgICBmb3Igb3NfbmFtZSwgb3NfdmVyc2lvbiBpbiBzZWxmLm1hcHBpbmdfZm9y X3BsYXRmb3JtKHBsYXRmb3JtLCB0YWJsZSkuaXRlcml0ZW1zKCk6CiAgICAgICAgICAgICBpZiB2 ZXJzaW9uID09IG9zX3ZlcnNpb246CiAgICAgICAgICAgICAgICAgcmV0dXJuIG9zX25hbWUKLSAg ICAgICAgICAgIGVsaWYgdmVyc2lvbi5jb250YWluZWRfaW4ob3NfdmVyc2lvbik6Ci0gICAgICAg ICAgICAgICAgaWYgY2xvc2VzdF9tYXRjaFsxXSBhbmQgY2xvc2VzdF9tYXRjaFsxXS5jb250YWlu ZWRfaW4ob3NfdmVyc2lvbik6CisgICAgICAgICAgICBlbGlmIHZlcnNpb24gaW4gb3NfdmVyc2lv bjoKKyAgICAgICAgICAgICAgICBpZiBjbG9zZXN0X21hdGNoWzFdIGFuZCBjbG9zZXN0X21hdGNo WzFdIGluIG9zX3ZlcnNpb246CiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAg ICAgICAgICAgY2xvc2VzdF9tYXRjaCA9IChvc19uYW1lLCBvc192ZXJzaW9uKQogICAgICAgICBy ZXR1cm4gY2xvc2VzdF9tYXRjaFswXQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vdmVyc2lvbl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi92ZXJzaW9uX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMjU4NTkpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi92ZXJzaW9uX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC0xMTAsMjAgKzExMCwyMCBAQCBjbGFzcyBWZXJzaW9uVGVzdENhc2UodW5pdHRlc3Qu VGVzdENhc2UpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKFZlcnNpb24oMCwgMCwgMykp LCAnMC4wLjMnKQogCiAgICAgZGVmIHRlc3RfY29udGFpbmVkX2luKHNlbGYpOgotICAgICAgICBz ZWxmLmFzc2VydFRydWUoVmVyc2lvbigxMSwgMSkuY29udGFpbmVkX2luKFZlcnNpb24oMTEpKSkK LSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZlcnNpb24oMTEsIDEsIDIpLmNvbnRhaW5lZF9pbihW ZXJzaW9uKDExLCAxKSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoVmVyc2lvbigxMSkuY29u dGFpbmVkX2luKFZlcnNpb24oMTEsIDEpKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShWZXJz aW9uKDExKS5jb250YWluZWRfaW4oVmVyc2lvbigxMSwgMSwgMikpKQotICAgICAgICBzZWxmLmFz c2VydEZhbHNlKFZlcnNpb24oMTEsIDEpLmNvbnRhaW5lZF9pbihWZXJzaW9uKDExLCAxLCAyKSkp Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShWZXJzaW9uKDExKS5jb250YWluZWRfaW4oVmVyc2lv bigxMSkpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoVmVyc2lvbigxMSwgMSkuY29udGFpbmVk X2luKFZlcnNpb24oMTEsIDEpKSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZlcnNpb24oMTEs IDEsIDIpLmNvbnRhaW5lZF9pbihWZXJzaW9uKDExLCAxLCAyKSkpCi0gICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZShWZXJzaW9uKDExKS5jb250YWluZWRfaW4oVmVyc2lvbigxMSwgMCkpKQotICAgICAg ICBzZWxmLmFzc2VydFRydWUoVmVyc2lvbigxMSwgMCkuY29udGFpbmVkX2luKFZlcnNpb24oMTEp KSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZlcnNpb24oMTEpLmNvbnRhaW5lZF9pbihWZXJz aW9uKDExLCAwLCAwKSkpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShWZXJzaW9uKDExLCAwLCAw KS5jb250YWluZWRfaW4oVmVyc2lvbigxMSkpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoVmVy c2lvbigxMSwgMSkuY29udGFpbmVkX2luKFZlcnNpb24oMTEsIDEsIDApKSkKLSAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKFZlcnNpb24oMTEsIDEsIDApLmNvbnRhaW5lZF9pbihWZXJzaW9uKDExLCAx KSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShWZXJzaW9uKDExLCAxKSBpbiBWZXJzaW9uKDEx KSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZlcnNpb24oMTEsIDEsIDIpIGluIFZlcnNpb24o MTEsIDEpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKFZlcnNpb24oMTEpIGluIFZlcnNpb24o MTEsIDEpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKFZlcnNpb24oMTEpIGluIFZlcnNpb24o MTEsIDEsIDIpKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKFZlcnNpb24oMTEsIDEpIGluIFZl cnNpb24oMTEsIDEsIDIpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoVmVyc2lvbigxMSkgaW4g VmVyc2lvbigxMSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShWZXJzaW9uKDExLCAxKSBpbiBW ZXJzaW9uKDExLCAxKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZlcnNpb24oMTEsIDEsIDIp IGluIFZlcnNpb24oMTEsIDEsIDIpKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoVmVyc2lvbigx MSkgaW4gVmVyc2lvbigxMSwgMCkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShWZXJzaW9uKDEx LCAwKSBpbiBWZXJzaW9uKDExKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZlcnNpb24oMTEp IGluIFZlcnNpb24oMTEsIDAsIDApKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoVmVyc2lvbigx MSwgMCwgMCkgaW4gVmVyc2lvbigxMSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShWZXJzaW9u KDExLCAxKSBpbiBWZXJzaW9uKDExLCAxLCAwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKFZl cnNpb24oMTEsIDEsIDApIGluIFZlcnNpb24oMTEsIDEpKQogCiAgICAgZGVmIHRlc3RfY29tcGFy ZV92ZXJzaW9ucyhzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChWZXJzaW9uKDEsIDIs IDMpLCBWZXJzaW9uKDEsIDIsIDMpKQo=