36865 2010-03-30 17:27:44 -0700 path to committers.py in commit-queue rejection message is wrong 2010-03-31 03:46:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth cjerdonek commit-queue oldest_to_newest 206287 0 eric 2010-03-30 17:27:44 -0700 path to committers.py in commit-queue rejection message is wrong Right now it's hardcoded in CommitterValidator (inside bugzilla.py) committer_list = "WebKitTools/Scripts/webkitpy/committers.py" I havne't yet found the magic for computing the __file__ dynamically. You can get the __file__ from a module object, but we import just the class and not the module. You can get the module name (string) from classname.__module__ or instance.__class__.__module__ But I don't yet know how to get to the actual module object. If we moved towards a model where we used: import committers statements instead of: from committers import CommitterList then we could easily just grab "committers.__file__" and be done. :) 206289 1 cjerdonek 2010-03-30 17:39:24 -0700 (In reply to comment #0) > If we moved towards a model where we used: > import committers > > statements instead of: > > from committers import CommitterList > > then we could easily just grab "committers.__file__" and be done. :) Why wouldn't you want to do "import committers" if you need it? Also, have you tried from committers import __file__? (Not sure if that would work.) 206290 2 cjerdonek 2010-03-30 17:40:17 -0700 (In reply to comment #1) > from committers import __file__? > > (Not sure if that would work.) Or better is probably-- from committers import __file__ as _committers_file 206375 3 cjerdonek 2010-03-30 23:34:23 -0700 (In reply to comment #2) > Or better is probably-- > > from committers import __file__ as _committers_file Yes, this works. But since it can return the .pyc file if it exists, you probably want to normalize the extension to .py. 206403 4 52140 eric 2010-03-31 01:18:40 -0700 Created attachment 52140 Patch 206404 5 52140 eric 2010-03-31 01:19:04 -0700 Comment on attachment 52140 Patch I am completely covered in Yak hair. 206413 6 52140 abarth 2010-03-31 01:40:00 -0700 Comment on attachment 52140 Patch This code is really wrong, but ok. /WebKitTools/svn/WebKitTools/Scripts/webkitpy 206447 7 52140 commit-queue 2010-03-31 03:46:05 -0700 Comment on attachment 52140 Patch Clearing flags on attachment: 52140 Committed r56835: <http://trac.webkit.org/changeset/56835> 206448 8 commit-queue 2010-03-31 03:46:11 -0700 All reviewed patches have been landed. Closing bug. 52140 2010-03-31 01:18:40 -0700 2010-03-31 03:46:05 -0700 Patch bug-36865-20100331011838.patch text/plain 6974 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA1M2ExYmQ0Li40ZTZkMjE5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMt MzEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHBhdGggdG8gY29tbWl0dGVycy5weSBpbiBjb21t aXQtcXVldWUgcmVqZWN0aW9uIG1lc3NhZ2UgaXMgd3JvbmcKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2ODY1CisKKyAgICAgICAgVGhpcyBmaXggd291 bGQgaGF2ZSBvbmx5IGJlZW4gMyBsaW5lcyBsb25nIGlmIHdlIGhhZAorICAgICAgICAxLiBIYWQg YWNjZXNzIHRvIGFuIFNDTSBvYmplY3Qgb3IgdG9vbCB0byBnaXZlIHVzIHRoZSBjaGVja291dCBy b290CisgICAgICAgIDIuIEJlZW4gYWJsZSB0byBkZXBlbmQgb24gUHl0aG9uIDIuNgorICAgICAg ICBJbnN0ZWFkIEkndmUgYWRkZWQgYSBidW5jaCBvZiBoYWNrIGNvZGUsIGJ1dCBhdCBsZWFzdCBu b3cKKyAgICAgICAgd2Ugc2hvdWxkIG5ldmVyIGhhdmUgdG8gdXBkYXRlIHRoaXMgc3RyaW5nIGFn YWluIGFzIHRoZSBsb2NhdGlvbgorICAgICAgICBvZiBjb21taXR0ZXJzLnB5IGlzIGZ1bGx5IGR5 bmFtaWNhbGx5IGRpc2NvdmVyZWQuIDpwCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVnemlsbGEucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v bmV0L2J1Z3ppbGxhX3VuaXR0ZXN0LnB5OgorCiAyMDEwLTAzLTMxICBTaGluaWNoaXJvIEhhbWFq aSAgPGhhbWFqaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCB0ZXN0IGZpeCBm b3IgcjU2ODA5LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1Z3ppbGxhLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v bmV0L2J1Z3ppbGxhLnB5CmluZGV4IDg3MGNlMjkuLjQ4MmEzYmQgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxsYS5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGEucHkKQEAgLTMwLDYg KzMwLDcgQEAKICMKICMgV2ViS2l0J3MgUHl0aG9uIG1vZHVsZSBmb3IgaW50ZXJhY3Rpbmcgd2l0 aCBCdWd6aWxsYQogCitpbXBvcnQgb3MucGF0aAogaW1wb3J0IHJlCiBpbXBvcnQgc3VicHJvY2Vz cwogCkBAIC0zNyw3ICszOCw3IEBAIGZyb20gZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lICMgdXNl ZCBpbiB0aW1lc3RhbXAoKQogCiAjIEltcG9ydCBXZWJLaXQtc3BlY2lmaWMgbW9kdWxlcy4KIGZy b20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5kZXByZWNhdGVkX2xvZ2dpbmcgaW1wb3J0IGVycm9y LCBsb2cKLWZyb20gd2Via2l0cHkuY29tbW9uLmNvbmZpZy5jb21taXR0ZXJzIGltcG9ydCBDb21t aXR0ZXJMaXN0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5jb25maWcgaW1wb3J0IGNvbW1pdHRlcnMK IGZyb20gd2Via2l0cHkuY29tbW9uLm5ldC5jcmVkZW50aWFscyBpbXBvcnQgQ3JlZGVudGlhbHMK IGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS51c2VyIGltcG9ydCBVc2VyCiBmcm9tIHdlYmtp dHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZCBpbXBvcnQgQnJvd3NlcgpAQCAtMjc3LDIzICsy NzgsNDMgQEAgY2xhc3MgQ29tbWl0dGVyVmFsaWRhdG9yKG9iamVjdCk6CiAgICAgZGVmIF92aWV3 X3NvdXJjZV91cmwoc2VsZiwgbG9jYWxfcGF0aCk6CiAgICAgICAgIHJldHVybiAiaHR0cDovL3Ry YWMud2Via2l0Lm9yZy9icm93c2VyL3RydW5rLyVzIiAlIGxvY2FsX3BhdGgKIAorICAgIGRlZiBf Y2hlY2tvdXRfcm9vdChzZWxmKToKKyAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBhIGhhY2ssIHdl IHdvdWxkIGhhdmUgdGhpcyBmcm9tIHNjbS5jaGVja291dF9yb290CisgICAgICAgICMgaWYgd2Ug aGFkIGFueSB3YXkgdG8gZ2V0IHRvIGFuIHNjbSBvYmplY3QgaGVyZS4KKyAgICAgICAgY29tcG9u ZW50cyA9IF9fZmlsZV9fLnNwbGl0KG9zLnNlcCkKKyAgICAgICAgdG9vbHNfaW5kZXggPSBjb21w b25lbnRzLmluZGV4KCJXZWJLaXRUb29scyIpCisgICAgICAgIHJldHVybiBvcy5zZXAuam9pbihj b21wb25lbnRzWzp0b29sc19pbmRleF0pCisKKyAgICBkZWYgX3JlbHBhdGgoc2VsZiwgcGF0aCwg c3RhcnQpOgorICAgICAgICAjIEZJWE1FOiBXaGVuIHdlJ3JlIGFsbG93ZWQgdG8gdXNlIHB5dGhv biAyLjYgd2UgY2FuIHVzZSB0aGUgcmVhbCBvcy5wYXRoLnJlbHBhdGgKKyAgICAgICAgcGF0aF9j b21wb25lbnRzID0gb3MucGF0aC5yZWFscGF0aChwYXRoKS5zcGxpdChvcy5zZXApCisgICAgICAg IHN0YXJ0X2NvbXBvbmVudHMgPSBvcy5wYXRoLnJlYWxwYXRoKHN0YXJ0KS5zcGxpdChvcy5zZXAp CisgICAgICAgIGlmIHBhdGhfY29tcG9uZW50c1tsZW4oc3RhcnRfY29tcG9uZW50cykgLSAxXS5s b3dlcigpICE9IHN0YXJ0X2NvbXBvbmVudHNbLTFdLmxvd2VyKCk6CisgICAgICAgICAgICByYWlz ZSAiVGhpcyBvcy5wYXRoLnJlbHBhdGggaGFjayBjYW4ndCBoYW5kbGUgcGF0aD0lcyBzdGFydD0l cyIgJSAocGF0aCwgc3RhcnQpCisgICAgICAgIHJldHVybiBvcy5zZXAuam9pbihwYXRoX2NvbXBv bmVudHNbbGVuKHN0YXJ0X2NvbXBvbmVudHMpOl0pCisKKyAgICBkZWYgX2NvbW1pdHRlcnNfcHlf cGF0aChzZWxmKToKKyAgICAgICAgIyBleHRlbnNpb24gY2FuIHNvbWV0aW1lcyBiZSAucHljLCB3 ZSBhbHdheXMgd2FudCAucHkKKyAgICAgICAgKHBhdGgsIGV4dGVuc2lvbikgPSBvcy5wYXRoLnNw bGl0ZXh0KGNvbW1pdHRlcnMuX19maWxlX18pCisgICAgICAgIHBhdGggPSBzZWxmLl9yZWxwYXRo KHBhdGgsIHNlbGYuX2NoZWNrb3V0X3Jvb3QoKSkKKyAgICAgICAgcmV0dXJuICIuIi5qb2luKFtw YXRoLCAicHkiXSkKKwogICAgIGRlZiBfZmxhZ19wZXJtaXNzaW9uX3JlamVjdGlvbl9tZXNzYWdl KHNlbGYsIHNldHRlcl9lbWFpbCwgZmxhZ19uYW1lKToKLSAgICAgICAgIyBUaGlzIGNvdWxkIGJl IGNvbXB1dGVkIGZyb20gQ29tbWl0dGVyTGlzdC5fX2ZpbGVfXwotICAgICAgICBjb21taXR0ZXJf bGlzdCA9ICJXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1pdHRlcnMucHkiCiAgICAg ICAgICMgU2hvdWxkIGNvbWUgZnJvbSBzb21lIHdlYmtpdF9jb25maWcucHkKICAgICAgICAgY29u dHJpYnV0aW9uX2d1aWRsaW5lcyA9ICJodHRwOi8vd2Via2l0Lm9yZy9jb2RpbmcvY29udHJpYnV0 aW5nLmh0bWwiCiAgICAgICAgICMgVGhpcyBjb3VsZCBiZSBxdWVyaWVkIGZyb20gdGhlIHN0YXR1 c19zZXJ2ZXIuCiAgICAgICAgIHF1ZXVlX2FkbWluaXN0cmF0b3IgPSAiZXNlaWRlbEBjaHJvbWl1 bS5vcmciCiAgICAgICAgICMgVGhpcyBjb3VsZCBiZSBxdWVyaWVkIGZyb20gdGhlIHRvb2wuCiAg ICAgICAgIHF1ZXVlX25hbWUgPSAiY29tbWl0LXF1ZXVlIgorICAgICAgICBjb21taXR0ZXJzX2xp c3QgPSBzZWxmLl9jb21taXR0ZXJzX3B5X3BhdGgoKQogICAgICAgICBtZXNzYWdlID0gIiVzIGRv ZXMgbm90IGhhdmUgJXMgcGVybWlzc2lvbnMgYWNjb3JkaW5nIHRvICVzLiIgJSAoCiAgICAgICAg ICAgICAgICAgICAgICAgICBzZXR0ZXJfZW1haWwsCiAgICAgICAgICAgICAgICAgICAgICAgICBm bGFnX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl92aWV3X3NvdXJjZV91cmwo Y29tbWl0dGVyX2xpc3QpKQorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fdmlld19zb3Vy Y2VfdXJsKGNvbW1pdHRlcnNfbGlzdCkpCiAgICAgICAgIG1lc3NhZ2UgKz0gIlxuXG4tIElmIHlv dSBkbyBub3QgaGF2ZSAlcyByaWdodHMgcGxlYXNlIHJlYWQgJXMgZm9yIGluc3RydWN0aW9ucyBv biBob3cgdG8gdXNlIGJ1Z3ppbGxhIGZsYWdzLiIgJSAoCiAgICAgICAgICAgICAgICAgICAgICAg ICBmbGFnX25hbWUsIGNvbnRyaWJ1dGlvbl9ndWlkbGluZXMpCiAgICAgICAgIG1lc3NhZ2UgKz0g IlxuXG4tIElmIHlvdSBoYXZlICVzIHJpZ2h0cyBwbGVhc2UgY29ycmVjdCB0aGUgZXJyb3IgaW4g JXMgYnkgYWRkaW5nIHlvdXJzZWxmIHRvIHRoZSBmaWxlIChubyByZXZpZXcgbmVlZGVkKS4gICIg JSAoCi0gICAgICAgICAgICAgICAgICAgICAgICBmbGFnX25hbWUsIGNvbW1pdHRlcl9saXN0KQor ICAgICAgICAgICAgICAgICAgICAgICAgZmxhZ19uYW1lLCBjb21taXR0ZXJzX2xpc3QpCiAgICAg ICAgIG1lc3NhZ2UgKz0gIkR1ZSB0byBidWcgMzAwODQgdGhlICVzIHdpbGwgcmVxdWlyZSBhIHJl c3RhcnQgYWZ0ZXIgeW91ciBjaGFuZ2UuICAiICUgcXVldWVfbmFtZQogICAgICAgICBtZXNzYWdl ICs9ICJQbGVhc2UgY29udGFjdCAlcyB0byByZXF1ZXN0IGEgJXMgcmVzdGFydC4gICIgJSAoCiAg ICAgICAgICAgICAgICAgICAgICAgICBxdWV1ZV9hZG1pbmlzdHJhdG9yLCBxdWV1ZV9uYW1lKQpA QCAtMzQ2LDcgKzM2Nyw3IEBAIGNsYXNzIENvbW1pdHRlclZhbGlkYXRvcihvYmplY3QpOgogCiBj bGFzcyBCdWd6aWxsYShvYmplY3QpOgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGRyeXJ1bj1G YWxzZSwgY29tbWl0dGVycz1Db21taXR0ZXJMaXN0KCkpOgorICAgIGRlZiBfX2luaXRfXyhzZWxm LCBkcnlydW49RmFsc2UsIGNvbW1pdHRlcnM9Y29tbWl0dGVycy5Db21taXR0ZXJMaXN0KCkpOgog ICAgICAgICBzZWxmLmRyeXJ1biA9IGRyeXJ1bgogICAgICAgICBzZWxmLmF1dGhlbnRpY2F0ZWQg PSBGYWxzZQogICAgICAgICBzZWxmLnF1ZXJpZXMgPSBCdWd6aWxsYVF1ZXJpZXMoc2VsZikKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWd6aWxs YV91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9i dWd6aWxsYV91bml0dGVzdC5weQppbmRleCBlMzlkNzBkLi5mY2RmYzM5IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVnemlsbGFfdW5pdHRlc3Qu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1Z3ppbGxh X3VuaXR0ZXN0LnB5CkBAIC02MSwxMSArNjEsMTIgQEAgY2xhc3MgQnVnVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiBjbGFzcyBDb21taXR0ZXJWYWxpZGF0b3JUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICBkZWYgdGVzdF9mbGFnX3Blcm1pc3Npb25fcmVqZWN0aW9uX21lc3NhZ2Uoc2VsZik6 CiAgICAgICAgIHZhbGlkYXRvciA9IENvbW1pdHRlclZhbGlkYXRvcihidWd6aWxsYT1Ob25lKQot ICAgICAgICBleHBlY3RlZF9tZXNzc2FnZT0iIiJmb29AZm9vLmNvbSBkb2VzIG5vdCBoYXZlIHJl dmlldyBwZXJtaXNzaW9ucyBhY2NvcmRpbmcgdG8gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9icm93 c2VyL3RydW5rL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbWl0dGVycy5weS4KKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbCh2YWxpZGF0b3IuX2NvbW1pdHRlcnNfcHlfcGF0aCgpLCAi V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2NvbW1pdHRlcnMucHki KQorICAgICAgICBleHBlY3RlZF9tZXNzc2FnZT0iIiJmb29AZm9vLmNvbSBkb2VzIG5vdCBoYXZl IHJldmlldyBwZXJtaXNzaW9ucyBhY2NvcmRpbmcgdG8gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9i cm93c2VyL3RydW5rL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9j b21taXR0ZXJzLnB5LgogCiAtIElmIHlvdSBkbyBub3QgaGF2ZSByZXZpZXcgcmlnaHRzIHBsZWFz ZSByZWFkIGh0dHA6Ly93ZWJraXQub3JnL2NvZGluZy9jb250cmlidXRpbmcuaHRtbCBmb3IgaW5z dHJ1Y3Rpb25zIG9uIGhvdyB0byB1c2UgYnVnemlsbGEgZmxhZ3MuCiAKLS0gSWYgeW91IGhhdmUg cmV2aWV3IHJpZ2h0cyBwbGVhc2UgY29ycmVjdCB0aGUgZXJyb3IgaW4gV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21taXR0ZXJzLnB5IGJ5IGFkZGluZyB5b3Vyc2VsZiB0byB0aGUgZmls ZSAobm8gcmV2aWV3IG5lZWRlZCkuICBEdWUgdG8gYnVnIDMwMDg0IHRoZSBjb21taXQtcXVldWUg d2lsbCByZXF1aXJlIGEgcmVzdGFydCBhZnRlciB5b3VyIGNoYW5nZS4gIFBsZWFzZSBjb250YWN0 IGVzZWlkZWxAY2hyb21pdW0ub3JnIHRvIHJlcXVlc3QgYSBjb21taXQtcXVldWUgcmVzdGFydC4g IEFmdGVyIHJlc3RhcnQgdGhlIGNvbW1pdC1xdWV1ZSB3aWxsIGNvcnJlY3RseSByZXNwZWN0IHlv dXIgcmV2aWV3IHJpZ2h0cy4iIiIKKy0gSWYgeW91IGhhdmUgcmV2aWV3IHJpZ2h0cyBwbGVhc2Ug Y29ycmVjdCB0aGUgZXJyb3IgaW4gV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL2NvbW1pdHRlcnMucHkgYnkgYWRkaW5nIHlvdXJzZWxmIHRvIHRoZSBmaWxlIChubyBy ZXZpZXcgbmVlZGVkKS4gIER1ZSB0byBidWcgMzAwODQgdGhlIGNvbW1pdC1xdWV1ZSB3aWxsIHJl cXVpcmUgYSByZXN0YXJ0IGFmdGVyIHlvdXIgY2hhbmdlLiAgUGxlYXNlIGNvbnRhY3QgZXNlaWRl bEBjaHJvbWl1bS5vcmcgdG8gcmVxdWVzdCBhIGNvbW1pdC1xdWV1ZSByZXN0YXJ0LiAgQWZ0ZXIg cmVzdGFydCB0aGUgY29tbWl0LXF1ZXVlIHdpbGwgY29ycmVjdGx5IHJlc3BlY3QgeW91ciByZXZp ZXcgcmlnaHRzLiIiIgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHZhbGlkYXRvci5fZmxhZ19w ZXJtaXNzaW9uX3JlamVjdGlvbl9tZXNzYWdlKCJmb29AZm9vLmNvbSIsICJyZXZpZXciKSwgZXhw ZWN0ZWRfbWVzc3NhZ2UpCiAKIAo=