31685 2009-11-19 14:12:39 -0800 Refactor help printing to use modern python idioms 2009-11-19 15:21:18 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth commit-queue oldest_to_newest 165087 0 eric 2009-11-19 14:12:39 -0800 Refactor help printing to use modern python idioms Getting ready to move all the help printing stuff into another class, but first I'm "cleaning" it by splitting it into smaller methods and using python idioms like map and filter instead of manual for loops. 165088 1 43522 eric 2009-11-19 14:13:24 -0800 Created attachment 43522 Patch 165107 2 43522 abarth 2009-11-19 15:09:43 -0800 Comment on attachment 43522 Patch Nice 165118 3 43522 commit-queue 2009-11-19 15:21:11 -0800 Comment on attachment 43522 Patch Clearing flags on attachment: 43522 Committed r51208: <http://trac.webkit.org/changeset/51208> 165119 4 commit-queue 2009-11-19 15:21:18 -0800 All reviewed patches have been landed. Closing bug. 43522 2009-11-19 14:13:24 -0800 2009-11-19 15:21:11 -0800 Patch bug-31685-20091119141323.patch text/plain 4277 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1M2E1YTM5Li5iZGExMzdkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMDktMTEt MTkgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlLWZhY3RvciBoZWxwIHByaW50aW5nIHRvIHVz ZSBtb2Rlcm4gcHl0aG9uIGlkaW9tcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzE2ODUKKworICAgICAgICAqIFNjcmlwdHMvYnVnemlsbGEtdG9vbDoK KworMjAwOS0xMS0xOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCiAKICAgICAgICAgYnVnemlsbGEtdG9vbCdzIHJldmll d2VyL2NvbW1pdHRlciByZWplY3Rpb24gbWVzc2FnZSBzaG91bGQgYmUgY2xlYXJlcgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9idWd6aWxsYS10b29sIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy9idWd6aWxsYS10b29sCmluZGV4IGJmMDViYjUuLmI3MmM5ZjIgMTAwNzU1Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvYnVnemlsbGEtdG9vbAorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L2J1Z3ppbGxhLXRvb2wKQEAgLTg5LDcgKzg5LDcgQEAgY2xhc3MgQ29tbWFuZDoKICAgICAgICAg c2VsZi5vcHRpb25zID0gb3B0aW9ucwogICAgICAgICBzZWxmLm9wdGlvbl9wYXJzZXIgPSBIZWxw UHJpbnRpbmdPcHRpb25QYXJzZXIodXNhZ2U9U1VQUFJFU1NfVVNBR0UsIGFkZF9oZWxwX29wdGlv bj1GYWxzZSwgb3B0aW9uX2xpc3Q9c2VsZi5vcHRpb25zKQogICAgICAgICBzZWxmLnJlcXVpcmVz X2xvY2FsX2NvbW1pdHMgPSByZXF1aXJlc19sb2NhbF9jb21taXRzCi0gICAgCisKICAgICBkZWYg bmFtZV93aXRoX2FyZ3VtZW50cyhzZWxmLCBjb21tYW5kX25hbWUpOgogICAgICAgICB1c2FnZV9z dHJpbmcgPSBjb21tYW5kX25hbWUKICAgICAgICAgaWYgbGVuKHNlbGYub3B0aW9ucykgPiAwOgpA QCAtOTAwLDI5ICs5MDAsMzUgQEAgY2xhc3MgQnVnemlsbGFUb29sOgogICAgIGRlZiB1c2FnZV9s aW5lKCk6CiAgICAgICAgIHJldHVybiAiVXNhZ2U6ICVwcm9nIFtvcHRpb25zXSBjb21tYW5kIFtj b21tYW5kLW9wdGlvbnNdIFtjb21tYW5kLWFyZ3VtZW50c10iCiAKLSAgICBkZWYgY29tbWFuZHNf dXNhZ2Uoc2VsZik6Ci0gICAgICAgIGNvbW1hbmRzX3RleHQgPSAiQ29tbWFuZHM6XG4iCi0gICAg ICAgIGxvbmdlc3RfbmFtZV9sZW5ndGggPSAwCi0gICAgICAgIGNvbW1hbmRfcm93cyA9IFtdCi0g ICAgICAgIHNjbV9zdXBwb3J0c19sb2NhbF9jb21taXRzID0gc2VsZi5zY20oKS5zdXBwb3J0c19s b2NhbF9jb21taXRzKCkKLSAgICAgICAgZm9yIGNvbW1hbmQgaW4gc2VsZi5jb21tYW5kczoKLSAg ICAgICAgICAgIGNvbW1hbmRfb2JqZWN0ID0gY29tbWFuZFsib2JqZWN0Il0KLSAgICAgICAgICAg IGlmIGNvbW1hbmRfb2JqZWN0LnJlcXVpcmVzX2xvY2FsX2NvbW1pdHMgYW5kIG5vdCBzY21fc3Vw cG9ydHNfbG9jYWxfY29tbWl0czoKLSAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAgICAg ICAgY29tbWFuZF9uYW1lX2FuZF9hcmdzID0gY29tbWFuZF9vYmplY3QubmFtZV93aXRoX2FyZ3Vt ZW50cyhjb21tYW5kWyJuYW1lIl0pCi0gICAgICAgICAgICBjb21tYW5kX3Jvd3MuYXBwZW5kKHsg Im5hbWUtYW5kLWFyZ3MiOiBjb21tYW5kX25hbWVfYW5kX2FyZ3MsICJvYmplY3QiOiBjb21tYW5k X29iamVjdCB9KQotICAgICAgICAgICAgbG9uZ2VzdF9uYW1lX2xlbmd0aCA9IG1heChbbG9uZ2Vz dF9uYW1lX2xlbmd0aCwgbGVuKGNvbW1hbmRfbmFtZV9hbmRfYXJncyldKQotICAgICAgICAKKyAg ICAjIEZJWE1FOiBUaGlzIGNhbiBhbGwgYmUgc2ltcGxpZmllZCBvbmNlIENvbW1hbmQgb2JqZWN0 cyBrbm93IHRoZWlyIG93biBuYW1lcy4KKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9uYW1l X2FuZF9hcmd1bWVudHMoY29tbWFuZCk6CisgICAgICAgIHJldHVybiBjb21tYW5kWydvYmplY3Qn XS5uYW1lX3dpdGhfYXJndW1lbnRzKGNvbW1hbmRbIm5hbWUiXSkKKworICAgIGRlZiBfY29tbWFu ZF9oZWxwX2Zvcm1hdHRlcihzZWxmKToKICAgICAgICAgIyBVc2Ugb3VyIG93biBoZWxwIGZvcm1h dHRlciBzbyBhcyB0byBpbmRlbnQgZW5vdWdoLgogICAgICAgICBmb3JtYXR0ZXIgPSBJbmRlbnRl ZEhlbHBGb3JtYXR0ZXIoKQogICAgICAgICBmb3JtYXR0ZXIuaW5kZW50KCkKICAgICAgICAgZm9y bWF0dGVyLmluZGVudCgpCi0gICAgICAgIAotICAgICAgICBmb3Igcm93IGluIGNvbW1hbmRfcm93 czoKLSAgICAgICAgICAgIGNvbW1hbmRfb2JqZWN0ID0gcm93WyJvYmplY3QiXQotICAgICAgICAg ICAgY29tbWFuZHNfdGV4dCArPSAiICAiICsgcm93WyJuYW1lLWFuZC1hcmdzIl0ubGp1c3QobG9u Z2VzdF9uYW1lX2xlbmd0aCArIDMpICsgY29tbWFuZF9vYmplY3QuaGVscF90ZXh0ICsgIlxuIgot ICAgICAgICAgICAgY29tbWFuZHNfdGV4dCArPSBjb21tYW5kX29iamVjdC5vcHRpb25fcGFyc2Vy LmZvcm1hdF9vcHRpb25faGVscChmb3JtYXR0ZXIpCi0gICAgICAgIHJldHVybiBjb21tYW5kc190 ZXh0CisgICAgICAgIHJldHVybiBmb3JtYXR0ZXIKKworICAgIEBjbGFzc21ldGhvZAorICAgIGRl ZiBfaGVscF9mb3JfY29tbWFuZChjbHMsIGNvbW1hbmQsIGZvcm1hdHRlciwgbG9uZ2VzdF9uYW1l X2xlbmd0aCk6CisgICAgICAgIGhlbHBfdGV4dCA9ICIgICIgKyBjbHMuX25hbWVfYW5kX2FyZ3Vt ZW50cyhjb21tYW5kKS5sanVzdChsb25nZXN0X25hbWVfbGVuZ3RoICsgMykgKyBjb21tYW5kWydv YmplY3QnXS5oZWxwX3RleHQgKyAiXG4iCisgICAgICAgIGhlbHBfdGV4dCArPSBjb21tYW5kWydv YmplY3QnXS5vcHRpb25fcGFyc2VyLmZvcm1hdF9vcHRpb25faGVscChmb3JtYXR0ZXIpCisgICAg ICAgIHJldHVybiBoZWxwX3RleHQKKworICAgIGRlZiBjb21tYW5kc191c2FnZShzZWxmKToKKyAg ICAgICAgaWYgbm90IHNlbGYuc2NtKCkuc3VwcG9ydHNfbG9jYWxfY29tbWl0cygpOgorICAgICAg ICAgICAgY29tbWFuZF9maWx0ZXIgPSBsYW1iZGEgY29tbWFuZDogbm90IGNvbW1hbmRbIm9iamVj dCJdLnJlcXVpcmVzX2xvY2FsX2NvbW1pdHMKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNv bW1hbmRfZmlsdGVyID0gTm9uZQorCisgICAgICAgICMgT25seSBzaG93IGNvbW1hbmRzIHdoaWNo IGFyZSByZWxldmFudCB0byB0aGlzIGNoZWNrb3V0LiAgVGhpcyBtaWdodCBiZSBjb25mdXNpbmcg dG8gc29tZSB1c2Vycz8KKyAgICAgICAgcmVsZXZhbnRfY29tbWFuZHMgPSBmaWx0ZXIoY29tbWFu ZF9maWx0ZXIsIHNlbGYuY29tbWFuZHMpCisgICAgICAgIGxvbmdlc3RfbmFtZV9sZW5ndGggPSBt YXgobWFwKGxhbWJkYSBjb21tYW5kOiBsZW4oc2VsZi5fbmFtZV9hbmRfYXJndW1lbnRzKGNvbW1h bmQpKSwgcmVsZXZhbnRfY29tbWFuZHMpKQorICAgICAgICBjb21tYW5kX2hlbHBfdGV4dHMgPSBt YXAobGFtYmRhIGNvbW1hbmQ6IHNlbGYuX2hlbHBfZm9yX2NvbW1hbmQoY29tbWFuZCwgc2VsZi5f Y29tbWFuZF9oZWxwX2Zvcm1hdHRlcigpLCBsb25nZXN0X25hbWVfbGVuZ3RoKSwgcmVsZXZhbnRf Y29tbWFuZHMpCisgICAgICAgIHJldHVybiAiQ29tbWFuZHM6XG4iICsgIiIuam9pbihjb21tYW5k X2hlbHBfdGV4dHMpCiAKICAgICBkZWYgaGFuZGxlX2dsb2JhbF9hcmdzKHNlbGYsIGFyZ3MpOgog ICAgICAgICAob3B0aW9ucywgYXJncykgPSBzZWxmLmdsb2JhbF9vcHRpb25fcGFyc2VyLnBhcnNl X2FyZ3MoYXJncykKQEAgLTk2NCw3ICs5NzAsNyBAQCBjbGFzcyBCdWd6aWxsYVRvb2w6CiAgICAg ICAgIAogICAgICAgICBpZiBub3QgY29tbWFuZF9uYW1lOgogICAgICAgICAgICAgc2VsZi5nbG9i YWxfb3B0aW9uX3BhcnNlci5lcnJvcigiTm8gY29tbWFuZCBzcGVjaWZpZWQiKQotICAgICAgICAK KwogICAgICAgICBjb21tYW5kID0gc2VsZi5jb21tYW5kX2J5X25hbWUoY29tbWFuZF9uYW1lKQog ICAgICAgICBpZiBub3QgY29tbWFuZDoKICAgICAgICAgICAgIHNlbGYuZ2xvYmFsX29wdGlvbl9w YXJzZXIuZXJyb3IoY29tbWFuZF9uYW1lICsgIiBpcyBub3QgYSByZWNvZ25pemVkIGNvbW1hbmQi KQo=