218582 2020-11-04 12:31:55 -0800 [build.webkit.org] remove unnecessary code from loadConfig 2021-02-08 07:37:49 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 175056 1 aakash_jain aakash_jain aakash_jain dewei_zhu jbedard webkit-bug-importer oldest_to_newest 1704560 0 aakash_jain 2020-11-04 12:31:55 -0800 loadConfig.py contains code about Python 2.6, e.g.:"Python 2.6 can't handle unicode keys as keyword arguments http://bugs.python.org/issue2646" This was added ~9 years ago in https://trac.webkit.org/changeset/92772/webkit. We are using Python 2.7.5 on build.webkit.org and are planning to upgrade to Python 3 soon. We should remove this unnecessary code for Python 2.6 workaround. 1704562 1 413194 aakash_jain 2020-11-04 12:39:38 -0800 Created attachment 413194 Patch 1704568 2 dewei_zhu 2020-11-04 12:55:22 -0800 r=me 1704618 3 ews-feeder 2020-11-04 14:56:09 -0800 Committed r269395: <https://trac.webkit.org/changeset/269395> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413194. 1704621 4 webkit-bug-importer 2020-11-04 14:57:19 -0800 <rdar://problem/71053059> 413194 2020-11-04 12:39:38 -0800 2020-11-04 14:56:09 -0800 Patch bug-218582-20201104153937.patch text/plain 2957 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2OTM3NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTExLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gcmVtb3ZlIHVubmVjZXNzYXJ5IGNvZGUg ZnJvbSBsb2FkQ29uZmlnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTg1ODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIENJU3VwcG9ydC9ld3MtYnVpbGQvbG9hZENvbmZpZy5weToKKyAgICAgICAgKGxv YWRCdWlsZGVyQ29uZmlnKTogQWxzbyByZW5hbWVkIHZhcmlhYmxlcyB0byBiZSBjb25zaXN0ZW50 IHdpdGggRVdTIGNvdW50ZXJwYXJ0LgorICAgICAgICAqIENJU3VwcG9ydC9idWlsZC13ZWJraXQt b3JnL2xvYWRDb25maWcucHk6CisgICAgICAgIChsb2FkQnVpbGRlckNvbmZpZyk6CisKIDIwMjAt MTEtMDMgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CiAKICAgICAgICAgU2V0IHVw IGJhc2ljIGluZnJhc3RydWN0dXJlIGZvciBTcGVlY2hSZWNvZ25pdGlvbgpJbmRleDogVG9vbHMv Q0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvbG9hZENvbmZpZy5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9sb2FkQ29uZmlnLnB5CShyZXZpc2lvbiAy NjkzNzQpCisrKyBUb29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0LW9yZy9sb2FkQ29uZmlnLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC03MywxMyArNzMsOSBAQCBkZWYgbG9hZEJ1aWxkZXJDb25maWco YywgaXNfdGVzdF9tb2RlX2VuCiAgICAgZm9yIHNjaGVkdWxlciBpbiBjb25maWdbJ3NjaGVkdWxl cnMnXToKICAgICAgICAgaWYgImNoYW5nZV9maWx0ZXIiIGluIHNjaGVkdWxlcjoKICAgICAgICAg ICAgIHNjaGVkdWxlclsiY2hhbmdlX2ZpbHRlciJdID0gZ2xvYmFscygpW3NjaGVkdWxlclsiY2hh bmdlX2ZpbHRlciJdXQotICAgICAgICBzY2hlZHVsZXJUeXBlID0gZ2xvYmFscygpW3NjaGVkdWxl ci5wb3AoJ3R5cGUnKV0KLSAgICAgICAgIyBQeXRob24gMi42IGNhbid0IGhhbmRsZSB1bmljb2Rl IGtleXMgYXMga2V5d29yZCBhcmd1bWVudHM6Ci0gICAgICAgICMgaHR0cDovL2J1Z3MucHl0aG9u Lm9yZy9pc3N1ZTI2NDYuICBNb2Rlcm4gdmVyc2lvbnMgb2YganNvbiByZXR1cm4KLSAgICAgICAg IyB1bmljb2RlIHN0cmluZ3MgZnJvbSBqc29uLmxvYWQsIHNvIHdlIG1hcCBhbGwga2V5cyB0byBz dHIgb2JqZWN0cy4KLSAgICAgICAgc2NoZWR1bGVyID0gZGljdChtYXAobGFtYmRhIGtleV92YWx1 ZV9wYWlyOiAoc3RyKGtleV92YWx1ZV9wYWlyWzBdKSwga2V5X3ZhbHVlX3BhaXJbMV0pLCBzY2hl ZHVsZXIuaXRlbXMoKSkpCi0KLSAgICAgICAgY1snc2NoZWR1bGVycyddLmFwcGVuZChzY2hlZHVs ZXJUeXBlKCoqc2NoZWR1bGVyKSkKKyAgICAgICAgc2NoZWR1bGVyQ2xhc3NOYW1lID0gc2NoZWR1 bGVyLnBvcCgndHlwZScpCisgICAgICAgIHNjaGVkdWxlckNsYXNzID0gZ2xvYmFscygpW3NjaGVk dWxlckNsYXNzTmFtZV0KKyAgICAgICAgY1snc2NoZWR1bGVycyddLmFwcGVuZChzY2hlZHVsZXJD bGFzcygqKnNjaGVkdWxlcikpCiAKICAgICBmb3JjZVNjaGVkdWxlciA9IEZvcmNlU2NoZWR1bGVy KAogICAgICAgICBuYW1lPSJmb3JjZSIsCkluZGV4OiBUb29scy9DSVN1cHBvcnQvZXdzLWJ1aWxk L2xvYWRDb25maWcucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2V3cy1idWlsZC9s b2FkQ29uZmlnLnB5CShyZXZpc2lvbiAyNjkzNzQpCisrKyBUb29scy9DSVN1cHBvcnQvZXdzLWJ1 aWxkL2xvYWRDb25maWcucHkJKHdvcmtpbmcgY29weSkKQEAgLTc5LDEwICs3OSw2IEBAIGRlZiBs b2FkQnVpbGRlckNvbmZpZyhjLCBpc190ZXN0X21vZGVfZW4KICAgICBmb3Igc2NoZWR1bGVyIGlu IGNvbmZpZ1snc2NoZWR1bGVycyddOgogICAgICAgICBzY2hlZHVsZXJDbGFzc05hbWUgPSBzY2hl ZHVsZXIucG9wKCd0eXBlJykKICAgICAgICAgc2NoZWR1bGVyQ2xhc3MgPSBnbG9iYWxzKClbc2No ZWR1bGVyQ2xhc3NOYW1lXQotICAgICAgICAjIFB5dGhvbiAyLjYgY2FuJ3QgaGFuZGxlIHVuaWNv ZGUga2V5cyBhcyBrZXl3b3JkIGFyZ3VtZW50czoKLSAgICAgICAgIyBodHRwOi8vYnVncy5weXRo b24ub3JnL2lzc3VlMjY0Ni4gIE1vZGVybiB2ZXJzaW9ucyBvZiBqc29uIHJldHVybgotICAgICAg ICAjIHVuaWNvZGUgc3RyaW5ncyBmcm9tIGpzb24ubG9hZCwgc28gd2UgbWFwIGFsbCBrZXlzIHRv IHN0ciBvYmplY3RzLgotICAgICAgICBzY2hlZHVsZXIgPSBkaWN0KG1hcChsYW1iZGEga2V5X3Zh bHVlX3BhaXI6IChzdHIoa2V5X3ZhbHVlX3BhaXJbMF0pLCBrZXlfdmFsdWVfcGFpclsxXSksIHNj aGVkdWxlci5pdGVtcygpKSkKICAgICAgICAgaWYgKHNjaGVkdWxlckNsYXNzTmFtZSA9PSAnVHJ5 X1VzZXJwYXNzJyk6CiAgICAgICAgICAgICAjIEZJWE1FOiBSZWFkIHRoZSBjcmVkZW50aWFscyBm cm9tIGxvY2FsIGZpbGUgb24gZGlzay4KICAgICAgICAgICAgIHNjaGVkdWxlclsndXNlcnBhc3Mn XSA9IFsob3MuZ2V0ZW52KCdCVUlMREJPVF9UUllfVVNFUk5BTUUnLCAnc2FtcGxldXNlcicpLCBv cy5nZXRlbnYoJ0JVSUxEQk9UX1RSWV9QQVNTV09SRCcsICdzYW1wbGVwYXNzJykpXQo=