224978 2021-04-23 07:57:52 -0700 jsonchecker.py validate_string uses Python 2 basestring type instead of Python 2/3 str type 2021-04-25 10:41:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 twilco.o twilco.o darin esprehn+autocc ews-watchlist glenn gyuyoung.kim jbedard joepeck macpherson menard simon.fraser webkit-bug-importer oldest_to_newest 1753582 0 twilco.o 2021-04-23 07:57:52 -0700 This causes the check to exit early the first time it validates a string. This error is then printed: name 'basestring' is not defined We can use the str type instead, which is valid for both Python 2 and Python 3. 1753588 1 426909 twilco.o 2021-04-23 08:17:01 -0700 Created attachment 426909 Patch 1753655 2 426909 jbedard 2021-04-23 11:08:53 -0700 Comment on attachment 426909 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=426909&action=review > Source/WebCore/css/CSSProperties.json:7233 > + }, This change seems like it should be separate and doesn't match what the bug description says. 1753674 3 426933 twilco.o 2021-04-23 12:27:17 -0700 Created attachment 426933 Patch 1753675 4 twilco.o 2021-04-23 12:28:03 -0700 (In reply to Jonathan Bedard from comment #2) > Comment on attachment 426909 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=426909&action=review > > > Source/WebCore/css/CSSProperties.json:7233 > > + }, > > This change seems like it should be separate and doesn't match what the bug > description says. OK, I uploaded a new patch with just the jsonchecker.py changes. 1754020 5 ews-feeder 2021-04-25 10:40:06 -0700 Committed r276564 (237000@main): <https://commits.webkit.org/237000@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426933. 1754022 6 webkit-bug-importer 2021-04-25 10:41:15 -0700 <rdar://problem/77124938> 426909 2021-04-23 08:17:01 -0700 2021-04-23 12:27:14 -0700 Patch bug-224978-20210423101700.patch text/plain 3892 twilco.o U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWNkNTI0ZmE4YzVlZDZm MGZhYTI4ZmY4ODEwOWM5MWNmODYzNDAwNi4uMjY0MTU1ODg5YTNhM2I0MTQ2NmUzNjJlNzljNDNj OTY2Y2MzNjYxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIxLTA0LTIzICBUeWxl ciBXaWxjb2NrICA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+CisKKyAgICAgICAganNvbmNoZWNr ZXIucHkgdmFsaWRhdGVfc3RyaW5nIHVzZXMgUHl0aG9uIDIgYmFzZXN0cmluZyB0eXBlIGluc3Rl YWQgb2YgUHl0aG9uIDIvMyBzdHIgdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydGllcy5qc29uOgorICAgICAgICBBZGQg bWlzc2luZyBjc3MtY29udGFpbiBjYXRlZ29yeS4KKwogMjAyMS0wNC0yMyAgUGhpbGlwcGUgTm9y bWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1N0cmVh bWVyIGZvbGxvdy11cCBhZnRlciByMjc2NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUHJvcGVydGllcy5qc29uIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnRpZXMu anNvbgppbmRleCA0NzFiOTlkY2RkODVjMjEwYTk0NTEzMTgyNDFmMzJlYzA2NDYxN2Q0Li5mYTVm MTgxOTYxOTkyMDY5OGU3ZTBjZGY1MDRkNjU4NDI2Y2NmZDFjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJvcGVydGllcy5qc29uCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcm9wZXJ0aWVzLmpzb24KQEAgLTcyMjYsNiArNzIyNiwxMSBAQAogICAgICAgICAgICAgImxv bmduYW1lIjogIkNTUyBDb21wb3NpdGluZyBhbmQgQmxlbmRpbmciLAogICAgICAgICAgICAgInVy bCI6ICJodHRwczovL3d3dy53My5vcmcvVFIvY29tcG9zaXRpbmctMS8iCiAgICAgICAgIH0sCisg ICAgICAgICJjc3MtY29udGFpbiI6IHsKKyAgICAgICAgICAgICJzaG9ydG5hbWUiOiAiQ1NTIENv bnRhaW5tZW50IiwKKyAgICAgICAgICAgICJsb25nbmFtZSI6ICJDU1MgQ29udGFpbm1lbnQgTW9k dWxlIiwKKyAgICAgICAgICAgICJ1cmwiOiAiaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1j b250YWluLTIvIgorICAgICAgICB9LAogICAgICAgICAiY3NzLWNvbnRlbnQiOiB7CiAgICAgICAg ICAgICAic2hvcnRuYW1lIjogIkNTUyBHZW5lcmF0ZWQgQ29udGVudCIsCiAgICAgICAgICAgICAi bG9uZ25hbWUiOiAiQ1NTIEdlbmVyYXRlZCBDb250ZW50IE1vZHVsZSIsCmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzU4MWRlYTI3OGExNjAxZTky ZGZiM2Y5YjlhZDM2YTk0NjJhZDg0ZC4uMzQyNzBkNWUwMTQ5OGExMTFkZWQwMDBkMTRhNGU0MjY2 YjY0ZjNmYiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMyIEBACisyMDIxLTA0LTIzICBUeWxlciBXaWxjb2NrICA8dHdpbGNvLm9A cHJvdG9ubWFpbC5jb20+CisKKyAgICAgICAganNvbmNoZWNrZXIucHkgdmFsaWRhdGVfc3RyaW5n IHVzZXMgUHl0aG9uIDIgYmFzZXN0cmluZyB0eXBlIGluc3RlYWQgb2YgUHl0aG9uIDIvMyBzdHIg dHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0 OTc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgdmFs aWRhdGVfc3RyaW5nIHVzZXMgdGhlIFB5dGhvbiAyIGJhc2VzdHJpbmcgdHlwZSBpbnN0ZWFkIG9m IHRoZSBQeXRob24gMi8zCisgICAgICAgIHN0ciB0eXBlLiAgVGhpcyBjYXVzZXMgdGhlIGNoZWNr IHRvIGV4aXQgZWFybHkgdGhlIGZpcnN0IHRpbWUgaXQgdmFsaWRhdGVzCisgICAgICAgIGEgc3Ry aW5nIHdpdGggdGhpcyBlcnJvcjoKKworICAgICAgICBuYW1lICdiYXNlc3RyaW5nJyBpcyBub3Qg ZGVmaW5lZAorCisgICAgICAgIFRoaXMgcmVzdWx0ZWQgaW4ganNvbmNoZWNrZXIgbm90IGNoZWNr aW5nIHRoZSBmaWxlIGJleW9uZCB0aGUgZmlyc3QKKyAgICAgICAgc3RyaW5nIHZhbGlkYXRpb24u ICBUaGlzIGlzIGV2aWRlbmNlZCBieSB0aGUgZmFjdCB0aGF0IGFmdGVyIG1ha2luZworICAgICAg ICB0aGlzIGNoYW5nZSwgY2hlY2std2Via2l0LXN0eWxlIHJlcG9ydGVkIGEgbWlzc2luZyBzcGVj aWZpY2F0aW9uCisgICAgICAgIGNhdGVnb3J5IGZvciBjc3MtY29udGFpbiwgd2hpY2ggd2FzIGFk ZGVkIHdpdGggdGhpcyBwYXRjaC4KKworICAgICAgICBJIGFsc28gYmVsaWV2ZSB0aGlzIGNhdXNl ZCBqc29uY2hlY2tlciB0byBtaXNzIGEgYnVnIGluIG9uZSBvZiBteSBwcmV2aW91cworICAgICAg ICBwYXRjaGVzIGluIHdoaWNoIEkgcHV0IHRoZSAic2V0dGluZ3MtZmxhZyIgcHJvcGVydHkgaW4g dGhlIHdyb25nCisgICAgICAgIHBsYWNlOgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ3MTgjYzIwCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL2pzb25jaGVja2VyLnB5OgorICAgICAgICAoSlNPTkNTU1Byb3Bl cnRpZXNDaGVja2VyLnZhbGlkYXRlX3N0cmluZyk6CisgICAgICAgIHZhbGlkYXRlX3N0cmluZyB3 aXRoIFB5dGhvbiAyIC8gMyBzdHIgdHlwZSBpbnN0ZWFkIG9mIFB5dGhvbiAyCisgICAgICAgIGJh c2VzdHJpbmcuCisKIDIwMjEtMDQtMjIgIFR5bGVyIFdpbGNvY2sgIDx0d2lsY28ub0Bwcm90b25t YWlsLmNvbT4KIAogICAgICAgICBbY3NzLWNvdW50ZXItc3R5bGVzXSBQYXJzZSBAY291bnRlci1z dHlsZSBkZXNjcmlwdG9ycwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9qc29uY2hlY2tlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlcnMvanNvbmNoZWNrZXIucHkKaW5kZXggNGM2ODcwYmFjZmM5N2E1YTJmMDllN2MxMTRm ODA4ODU0OTcwNjhmMy4uOGE3YTRkYjg5YWI5ZjM3ZWJmYWVmYmQyNjg4ZTMxMzU3MTA5ZjRhZiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qc29uY2hl Y2tlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pzb25j aGVja2VyLnB5CkBAIC0xNjQsNyArMTY0LDcgQEAgY2xhc3MgSlNPTkNTU1Byb3BlcnRpZXNDaGVj a2VyKEpTT05DaGVja2VyKToKICAgICAgICAgc2VsZi52YWxpZGF0ZV90eXBlKHByb3BlcnR5X25h bWUsIHByb3BlcnR5X2tleSwga2V5LCB2YWx1ZSwgYm9vbCkKIAogICAgIGRlZiB2YWxpZGF0ZV9z dHJpbmcoc2VsZiwgcHJvcGVydHlfbmFtZSwgcHJvcGVydHlfa2V5LCBrZXksIHZhbHVlKToKLSAg ICAgICAgc2VsZi52YWxpZGF0ZV90eXBlKHByb3BlcnR5X25hbWUsIHByb3BlcnR5X2tleSwga2V5 LCB2YWx1ZSwgYmFzZXN0cmluZykKKyAgICAgICAgc2VsZi52YWxpZGF0ZV90eXBlKHByb3BlcnR5 X25hbWUsIHByb3BlcnR5X2tleSwga2V5LCB2YWx1ZSwgc3RyKQogCiAgICAgZGVmIHZhbGlkYXRl X2FycmF5KHNlbGYsIHByb3BlcnR5X25hbWUsIHByb3BlcnR5X2tleSwga2V5LCB2YWx1ZSk6CiAg ICAgICAgIHNlbGYudmFsaWRhdGVfdHlwZShwcm9wZXJ0eV9uYW1lLCBwcm9wZXJ0eV9rZXksIGtl eSwgdmFsdWUsIGxpc3QpCg== 426933 2021-04-23 12:27:17 -0700 2021-04-25 10:40:07 -0700 Patch bug-224978-20210423142716.patch text/plain 2258 twilco.o U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NDk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzU4MWRlYTI3OGExNjAxZTkyZGZiM2Y5YjlhZDM2YTk0 NjJhZDg0ZC4uZTM5ODliZTBmN2UyOWViMTRiYmUyZDE1ZDIyZThkZmJkY2M3NWUxYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMw IEBACisyMDIxLTA0LTIzICBUeWxlciBXaWxjb2NrICA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+ CisKKyAgICAgICAganNvbmNoZWNrZXIucHkgdmFsaWRhdGVfc3RyaW5nIHVzZXMgUHl0aG9uIDIg YmFzZXN0cmluZyB0eXBlIGluc3RlYWQgb2YgUHl0aG9uIDIvMyBzdHIgdHlwZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0OTc4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgdmFsaWRhdGVfc3RyaW5nIHVz ZXMgdGhlIFB5dGhvbiAyIGJhc2VzdHJpbmcgdHlwZSBpbnN0ZWFkIG9mIHRoZSBQeXRob24gMi8z CisgICAgICAgIHN0ciB0eXBlLiAgVGhpcyBjYXVzZXMgdGhlIGNoZWNrIHRvIGV4aXQgZWFybHkg dGhlIGZpcnN0IHRpbWUgaXQgdmFsaWRhdGVzCisgICAgICAgIGEgc3RyaW5nIHdpdGggdGhpcyBl cnJvcjoKKworICAgICAgICBuYW1lICdiYXNlc3RyaW5nJyBpcyBub3QgZGVmaW5lZAorCisgICAg ICAgIFRoaXMgcmVzdWx0ZWQgaW4ganNvbmNoZWNrZXIgbm90IGNoZWNraW5nIHRoZSBmaWxlIGJl eW9uZCB0aGUgZmlyc3QKKyAgICAgICAgc3RyaW5nIHZhbGlkYXRpb24uICAKKworICAgICAgICBJ IGJlbGlldmUgdGhpcyBjYXVzZWQganNvbmNoZWNrZXIgdG8gbWlzcyBhIGJ1ZyBpbiBvbmUgb2Yg bXkgcHJldmlvdXMKKyAgICAgICAgcGF0Y2hlcyBpbiB3aGljaCBJIHB1dCB0aGUgInNldHRpbmdz LWZsYWciIHByb3BlcnR5IGluIHRoZSB3cm9uZworICAgICAgICBwbGFjZToKKworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NzE4I2MyMAorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9qc29uY2hlY2tlci5weToKKyAg ICAgICAgKEpTT05DU1NQcm9wZXJ0aWVzQ2hlY2tlci52YWxpZGF0ZV9zdHJpbmcpOgorICAgICAg ICB2YWxpZGF0ZV9zdHJpbmcgd2l0aCBQeXRob24gMiAvIDMgc3RyIHR5cGUgaW5zdGVhZCBvZiBQ eXRob24gMgorICAgICAgICBiYXNlc3RyaW5nLgorCiAyMDIxLTA0LTIyICBUeWxlciBXaWxjb2Nr ICA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+CiAKICAgICAgICAgW2Nzcy1jb3VudGVyLXN0eWxl c10gUGFyc2UgQGNvdW50ZXItc3R5bGUgZGVzY3JpcHRvcnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvanNvbmNoZWNrZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2pzb25jaGVja2VyLnB5CmluZGV4IDRjNjg3MGJh Y2ZjOTdhNWEyZjA5ZTdjMTE0ZjgwODg1NDk3MDY4ZjMuLjhhN2E0ZGI4OWFiOWYzN2ViZmFlZmJk MjY4OGUzMTM1NzEwOWY0YWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcnMvanNvbmNoZWNrZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy9qc29uY2hlY2tlci5weQpAQCAtMTY0LDcgKzE2NCw3IEBAIGNsYXNzIEpT T05DU1NQcm9wZXJ0aWVzQ2hlY2tlcihKU09OQ2hlY2tlcik6CiAgICAgICAgIHNlbGYudmFsaWRh dGVfdHlwZShwcm9wZXJ0eV9uYW1lLCBwcm9wZXJ0eV9rZXksIGtleSwgdmFsdWUsIGJvb2wpCiAK ICAgICBkZWYgdmFsaWRhdGVfc3RyaW5nKHNlbGYsIHByb3BlcnR5X25hbWUsIHByb3BlcnR5X2tl eSwga2V5LCB2YWx1ZSk6Ci0gICAgICAgIHNlbGYudmFsaWRhdGVfdHlwZShwcm9wZXJ0eV9uYW1l LCBwcm9wZXJ0eV9rZXksIGtleSwgdmFsdWUsIGJhc2VzdHJpbmcpCisgICAgICAgIHNlbGYudmFs aWRhdGVfdHlwZShwcm9wZXJ0eV9uYW1lLCBwcm9wZXJ0eV9rZXksIGtleSwgdmFsdWUsIHN0cikK IAogICAgIGRlZiB2YWxpZGF0ZV9hcnJheShzZWxmLCBwcm9wZXJ0eV9uYW1lLCBwcm9wZXJ0eV9r ZXksIGtleSwgdmFsdWUpOgogICAgICAgICBzZWxmLnZhbGlkYXRlX3R5cGUocHJvcGVydHlfbmFt ZSwgcHJvcGVydHlfa2V5LCBrZXksIHZhbHVlLCBsaXN0KQo=