68850 2011-09-26 16:49:26 -0700 watchlist: Add parsing for definition section. 2011-09-26 17:02:59 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68822 1 levin levin abarth eric oldest_to_newest 473538 0 levin 2011-09-26 16:49:26 -0700 See summary. 473539 1 108756 levin 2011-09-26 16:50:31 -0700 Created attachment 108756 Patch 473541 2 108756 eric 2011-09-26 16:52:11 -0700 Comment on attachment 108756 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108756&action=review > Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py:41 > +def _parse_definition_section(definition_section, watch_list): You'll want these on an object, eventually. Even if that object is a singleton. That way it's easier to mock later. 473544 3 108756 abarth 2011-09-26 16:53:24 -0700 Comment on attachment 108756 Patch I think PEP8 requires all top-level definitions to have two blank lines between them. 473548 4 levin 2011-09-26 17:02:53 -0700 Committed as http://trac.webkit.org/changeset/96046 (In reply to comment #3) > (From update of attachment 108756 [details]) > I think PEP8 requires all top-level definitions to have two blank lines between them. Fixed for _eval_watch_list but not for the data structure definitions. fwiw PEP8 seems to not include them: "Separate top-level function and class definitions with two blank lines." and it would seem to introduce a lot of space to put in 2 blank lines around every top level data structure (dictionary, string, etc.) (In reply to comment #2) > (From update of attachment 108756 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=108756&action=review > > You'll want these on an object, eventually. Even if that object is a singleton. That way it's easier to mock later. Ok, I'll consider that for the next patch. I have to think about this. 108756 2011-09-26 16:50:31 -0700 2011-09-26 16:53:24 -0700 Patch bug-68850-20110926165030.patch text/plain 5336 levin U3VidmVyc2lvbiBSZXZpc2lvbjogOTYwMTAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwOGQwNDc4NzYzMjljMjYxNjRiNjRhYTBmY2FmZjAzM2Qx MzZkMzNjLi43NzhhMTIwYTExZjg4YWE3ZGMwNDNmNDUwZGVlNTEzZjZjNTYyZmFmIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMTEtMDktMjYgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIHdhdGNobGlzdDogQWRkIHBhcnNpbmcgZm9yIGRlZmluaXRpb24gc2VjdGlvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY4ODUwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlcl91bml0dGVzdC5w eToKKwogMjAxMS0wOS0yNiAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXBhaW50IHRlc3RzIGRvbid0IHdvcmsgaW4gV2ViS2l0MgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3QucHkKaW5k ZXggMmQ2OWIwYWYzOWVjN2U2ZDY0NmEwN2QyM2RmNWU5OGNjNGY2NzU0My4uMmQ2MWRhYjkxNmJj ZWUyMzRjNzNmYmI1ZDMxZGIyMDkwNWIwM2IwMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0LnB5CkBAIC0yOSw0ICsyOSw3IEBA CiAKIGNsYXNzIFdhdGNoTGlzdChvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAg ICAgICAgcGFzcworICAgICAgICBzZWxmLl9kZWZpbml0aW9ucyA9IHt9CisKKyAgICBkZWYgc2V0 X2RlZmluaXRpb25zKHNlbGYsIGRlZmluaXRpb25zKToKKyAgICAgICAgc2VsZi5fZGVmaW5pdGlv bnMgPSBkZWZpbml0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vd2F0Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3dhdGNobGlzdC93YXRjaGxpc3RwYXJzZXIucHkKaW5kZXggZTJhNmExMDE5NzdhM2Qw ZDc5NGNlZDFjNzE0NjA2YzQ4MGViZTAyOC4uMWFiNTIxN2E2NWEwMWQxOTE2MWY1NmFkY2E2MWNi YzQ3OGM0MWUwMCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0 Y2hsaXN0L3dhdGNobGlzdHBhcnNlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyLnB5CkBAIC0yNiwyNSArMjYsNTAgQEAKICMg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9ydCByZQogZnJvbSB3ZWJraXRweS5j b21tb24ud2F0Y2hsaXN0LndhdGNobGlzdCBpbXBvcnQgV2F0Y2hMaXN0CiAKK19ERUZJTklUSU9O UyA9ICdERUZJTklUSU9OUycKK19JTlZBTElEX0RFRklOSVRJT05fTkFNRV9SRUdFWCA9IHInXHwn CiAKIGRlZiBfZXZhbF93YXRjaF9saXN0KHdhdGNoX2xpc3RfY29udGVudHMpOgogICAgIHJldHVy biBldmFsKHdhdGNoX2xpc3RfY29udGVudHMsIHsnX19idWlsdGluc19fJzogTm9uZX0sIE5vbmUp CiAKK19ERUZJTklUSU9OX01BVENIX1BBUlNFUiA9IHt9CisKKworZGVmIF9wYXJzZV9kZWZpbml0 aW9uX3NlY3Rpb24oZGVmaW5pdGlvbl9zZWN0aW9uLCB3YXRjaF9saXN0KToKKyAgICBkZWZpbml0 aW9ucyA9IHt9CisgICAgZm9yIG5hbWUgaW4gZGVmaW5pdGlvbl9zZWN0aW9uOgorICAgICAgICBp bnZhbGlkX2NoYXJhY3RlciA9IHJlLnNlYXJjaChfSU5WQUxJRF9ERUZJTklUSU9OX05BTUVfUkVH RVgsIG5hbWUpCisgICAgICAgIGlmIGludmFsaWRfY2hhcmFjdGVyOgorICAgICAgICAgICAgcmFp c2UgRXhjZXB0aW9uKCdJbnZhbGlkIGNoYXJhY3RlciAiJXMiIGluIGRlZmluaXRpb24gIiVzIi4n ICUgKGludmFsaWRfY2hhcmFjdGVyLmdyb3VwKDApLCBuYW1lKSkKKworICAgICAgICBkZWZpbml0 aW9uID0gZGVmaW5pdGlvbl9zZWN0aW9uW25hbWVdCisgICAgICAgIGRlZmluaXRpb25zW25hbWVd ID0gW10KKyAgICAgICAgZm9yIHBhdHRlcm5fdHlwZSBpbiBkZWZpbml0aW9uOgorICAgICAgICAg ICAgcGF0dGVybl9wYXJzZXIgPSBfREVGSU5JVElPTl9NQVRDSF9QQVJTRVIuZ2V0KHBhdHRlcm5f dHlwZSkKKyAgICAgICAgICAgIGlmIG5vdCBwYXR0ZXJuX3BhcnNlcjoKKyAgICAgICAgICAgICAg ICByYWlzZSBFeGNlcHRpb24oJ0ludmFsaWQgcGF0dGVybiB0eXBlICIlcyIgaW4gZGVmaW5pdGlv biAiJXMiLicgJSAocGF0dGVybl90eXBlLCBuYW1lKSkKKworICAgICAgICAgICAgcGF0dGVybiA9 IHBhdHRlcm5fcGFyc2VyKGRlZmluaXRpb25bcGF0dGVybl90eXBlXSkKKyAgICAgICAgICAgIGRl ZmluaXRpb25zW25hbWVdLmFwcGVuZChwYXR0ZXJuKQorICAgIHdhdGNoX2xpc3Quc2V0X2RlZmlu aXRpb25zKGRlZmluaXRpb25zKQorCitfU0VDVElPTl9QQVJTRVJTID0ge19ERUZJTklUSU9OUzog X3BhcnNlX2RlZmluaXRpb25fc2VjdGlvbiwgfQorCiAKIGRlZiBwYXJzZV93YXRjaF9saXN0KHdh dGNoX2xpc3RfY29udGVudHMpOgogICAgIHdhdGNoX2xpc3QgPSBXYXRjaExpc3QoKQogCiAgICAg IyBDaGFuZ2UgdGhlIHdhdGNoIGxpc3QgdGV4dCBpbnRvIGEgZGljdGlvbmFyeS4KICAgICBkaWN0 aW9uYXJ5ID0gX2V2YWxfd2F0Y2hfbGlzdCh3YXRjaF9saXN0X2NvbnRlbnRzKQotICAgIHBhcnNl cnMgPSB7fQogCiAgICAgIyBQYXJzZSB0aGUgdG9wIGxldmVsIHNlY3Rpb25zIGluIHRoZSB3YXRj aCBsaXN0LgogICAgIGZvciBzZWN0aW9uIGluIGRpY3Rpb25hcnk6Ci0gICAgICAgIHBhcnNlciA9 IHBhcnNlcnMuZ2V0KHNlY3Rpb24pCisgICAgICAgIHBhcnNlciA9IF9TRUNUSU9OX1BBUlNFUlMu Z2V0KHNlY3Rpb24pCiAgICAgICAgIGlmIG5vdCBwYXJzZXI6Ci0gICAgICAgICAgICByYWlzZSBF eGNlcHRpb24oJ1Vua25vd24gc2VjdGlvbiBpbiB3YXRjaCBsaXN0OiAlcycgJSBzZWN0aW9uKQor ICAgICAgICAgICAgcmFpc2UgRXhjZXB0aW9uKCdVbmtub3duIHNlY3Rpb24gIiVzIiBpbiB3YXRj aCBsaXN0LicgJSBzZWN0aW9uKQogICAgICAgICBwYXJzZXIoZGljdGlvbmFyeVtzZWN0aW9uXSwg d2F0Y2hfbGlzdCkKIAogICAgIHJldHVybiB3YXRjaF9saXN0CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFyc2VyX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vd2F0Y2hsaXN0L3dhdGNobGlzdHBh cnNlcl91bml0dGVzdC5weQppbmRleCA5M2ZjY2Y2NzExY2JjMTI0ZTMyMzMxOWM0ODMxNmUwMjVh ZmZhOGM1Li40MWQyM2ZlMjY3ZjgzMDJmZjZlMDIxOTI2NzAyM2U2OWQ2MGI1YjIzIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi93YXRjaGxpc3Qvd2F0Y2hsaXN0cGFy c2VyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3dhdGNo bGlzdC93YXRjaGxpc3RwYXJzZXJfdW5pdHRlc3QucHkKQEAgLTQ5LDQgKzQ5LDI4IEBAIGNsYXNz IFdhdGNoTGlzdFBhcnNlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3Rf YmFkX3NlY3Rpb24oc2VsZik6CiAgICAgICAgIHdhdGNoX2xpc3Rfd2l0aF9iYWRfc2VjdGlvbiA9 ICgneyJGT08iOiB7fX0nKQotICAgICAgICBzZWxmLmFzc2VydFJhaXNlc1JlZ2V4cCgnVW5rbm93 biBzZWN0aW9uIGluIHdhdGNoIGxpc3Q6IEZPTycsIHBhcnNlX3dhdGNoX2xpc3QsIHdhdGNoX2xp c3Rfd2l0aF9iYWRfc2VjdGlvbikKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXNSZWdleHAoJ1Vu a25vd24gc2VjdGlvbiAiRk9PIiBpbiB3YXRjaCBsaXN0LicsIHBhcnNlX3dhdGNoX2xpc3QsIHdh dGNoX2xpc3Rfd2l0aF9iYWRfc2VjdGlvbikKKworICAgIGRlZiB0ZXN0X2JhZF9kZWZpbml0aW9u KHNlbGYpOgorICAgICAgICB3YXRjaF9saXN0X3dpdGhfYmFkX2RlZmluaXRpb24gPSAoCisgICAg ICAgICAgICAneycKKyAgICAgICAgICAgICcgICAgIkRFRklOSVRJT05TIjogeycKKyAgICAgICAg ICAgICcgICAgICAgICJXYXRjaExpc3QxfEEiOiB7JworICAgICAgICAgICAgJyAgICAgICAgICAg ICJmaWxlbmFtZSI6IHIiLipcXE15RmlsZU5hbWVcXC5jcHAiLCcKKyAgICAgICAgICAgICcgICAg ICAgIH0sJworICAgICAgICAgICAgJyAgICAgfSwnCisgICAgICAgICAgICAnfScpCisKKyAgICAg ICAgc2VsZi5fdmVyaWZ5RXhjZXB0aW9uKCdJbnZhbGlkIGNoYXJhY3RlciAifCIgaW4gZGVmaW5p dGlvbiAiV2F0Y2hMaXN0MXxBIi4nLCBwYXJzZV93YXRjaF9saXN0LCB3YXRjaF9saXN0X3dpdGhf YmFkX2RlZmluaXRpb24pCisKKyAgICBkZWYgdGVzdF9iYWRfbWF0Y2hfdHlwZShzZWxmKToKKyAg ICAgICAgd2F0Y2hfbGlzdF93aXRoX2JhZF9tYXRjaF90eXBlID0gKAorICAgICAgICAgICAgJ3sn CisgICAgICAgICAgICAnICAgICJERUZJTklUSU9OUyI6IHsnCisgICAgICAgICAgICAnICAgICAg ICAiV2F0Y2hMaXN0MSI6IHsnCisgICAgICAgICAgICAnICAgICAgICAgICAgIm5vdGhpbmdfbWF0 Y2hlc190aGlzIjogciIuKlxcTXlGaWxlTmFtZVxcLmNwcCIsJworICAgICAgICAgICAgJyAgICAg ICAgfSwnCisgICAgICAgICAgICAnICAgICB9LCcKKyAgICAgICAgICAgICd9JykKKworICAgICAg ICBzZWxmLl92ZXJpZnlFeGNlcHRpb24oJ0ludmFsaWQgcGF0dGVybiB0eXBlICJub3RoaW5nX21h dGNoZXNfdGhpcyIgaW4gZGVmaW5pdGlvbiAiV2F0Y2hMaXN0MSIuJywgcGFyc2Vfd2F0Y2hfbGlz dCwgd2F0Y2hfbGlzdF93aXRoX2JhZF9tYXRjaF90eXBlKQo=