35828 2010-03-06 05:03:48 -0800 python: Remove non-trivial code from webkitpy/__init__.py 2010-03-13 14:11:42 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 31533 1 cjerdonek cjerdonek abarth cjerdonek eric hamaji levin oldest_to_newest 196886 0 cjerdonek 2010-03-06 05:03:48 -0800 The __init__.py file of the top-level webkitpy package currently causes non-trivial code to execute (namely autoinstall.py code). This report is to remove non-trivial code like this from webkitpy/__init__.py. This allows calling code to import boot-strapping code like version-checking code and logging configuration code from webkitpy before any errors or log messages caused by code in __init__.py. In particular, callers will be able to do things like check and warn users about their Python version before erroring out on autoinstall, and configure logging prior to autoinstall so that autoinstall log messages can render. Another benefit is that autoinstall code can be placed in a location where it only executes if it is actually needed, instead of executing any time someone imports anything from webkitpy. 196894 1 50151 cjerdonek 2010-03-06 05:38:28 -0800 Created attachment 50151 Proposed patch 199342 2 50151 abarth 2010-03-13 02:08:22 -0800 Comment on attachment 50151 Proposed patch Ok. I'm slightly sad that we don't say "mechanize" anywhere when we import Browser. Is there some way to say: from webkitpy.thirdparty.autoinstalled.mechanize import Browser That seems the most natural to me. (In any case, this patch is an improvement.) 199406 3 cjerdonek 2010-03-13 13:43:45 -0800 (In reply to comment #2) > (From update of attachment 50151 [details]) > Ok. I'm slightly sad that we don't say "mechanize" anywhere when we import > Browser. Yeah, I agree. > Is there some way to say: > > from webkitpy.thirdparty.autoinstalled.mechanize import Browser I tried this and couldn't seem to get it to work -- probably because mechanize.py doesn't actually exist in thirdparty/autoinstalled. The closest I could come was this: > import webkitpy.thirdparty.autoinstalled.mechanize as mechanize > Browser = mechanize.Browser But that takes two lines in each calling file which seems less preferable. In any case, the good news is that this is a temporary measure. It will go away once I re-submit the autoinstall rewrite. I'll be doing that once I land all this version-checking stuff. 199410 4 cjerdonek 2010-03-13 14:11:42 -0800 Manually committed (via git svn dcommit): http://trac.webkit.org/changeset/55969 50151 2010-03-06 05:38:28 -0800 2010-03-13 02:08:22 -0800 Proposed patch _patch-35828-1.diff text/plain 6435 cjerdonek ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5OTVhYzI1Li5kNGY3ZTA4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMTAtMDMt MDYgIENocmlzIEplcmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZWQgYWxsIGNvZGUgaW4gd2Vi a2l0cHkvX19pbml0X18ucHkgdG8gYW5vdGhlciBsb2NhdGlvbi4KKworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU4MjgKKworICAgICAgICBLZWVwaW5n IHdlYmtpdHB5L19faW5pdF9fLnB5IGZyZWUgb2Ygbm9uLXRyaXZpYWwgY29kZSBhbGxvd3MKKyAg ICAgICAgY2FsbGluZyBjb2RlIHRvIGltcG9ydCBpbml0aWFsaXphdGlvbiBjb2RlIGZyb20gd2Vi a2l0cHkKKyAgICAgICAgYmVmb3JlIGFueSBlcnJvcnMgb3IgbG9nIG1lc3NhZ2VzIG9jY3VyIGR1 ZSB0byBjb2RlIGluCisgICAgICAgIF9faW5pdF9fLnB5LiAgU3VjaCBpbml0aWFsaXphdGlvbiBj b2RlIGNhbiBpbmNsdWRlIHRoaW5ncyBsaWtlCisgICAgICAgIHZlcnNpb24gY2hlY2tpbmcgY29k ZSBhbmQgbG9nZ2luZyBjb25maWd1cmF0aW9uIGNvZGUuICBUaGlzCisgICAgICAgIGFsc28gbGV0 cyB1cyBtb3ZlIHRoZSBhdXRvaW5zdGFsbCBpbml0aWFsaXphdGlvbiBjb2RlIHRvIGEKKyAgICAg ICAgbG9jYXRpb24gd2hlcmUgaXQgb25seSBleGVjdXRlcyBpZiBpdCBpcyBuZWVkZWQgLS0gc29t ZXRoaW5nCisgICAgICAgIHdlIGhhdmUgZG9uZSBpbiB0aGlzIHBhdGNoLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weToKKyAgICAgICAgICAtIE1vdmVkIGFsbCBleGVj dXRhYmxlIGNvZGUgdG8gdGhlIGZvbGxvd2luZyBsb2NhdGlvbjoKKyAgICAgICAgICAgIHdlYmtp dHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weQorICAgICAgICAgIC0gQWRk ZWQgYSBjb2RlIGNvbW1lbnQgdG8ga2VlcCB0aGlzIGZpbGUgZnJlZSBvZiBub24tdHJpdmlhbAor ICAgICAgICAgICAgY29kZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYnVnemlsbGEu cHk6CisgICAgICAgICAgLSBVcGRhdGVkIG1lY2hhbml6ZSBpbXBvcnQgc3RhdGVtZW50LgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9uZXR3b3JrdHJhbnNhY3Rpb24ucHk6CisgICAgICAg ICAgLSBVcGRhdGVkIG1lY2hhbml6ZSBpbXBvcnQgc3RhdGVtZW50LgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9uZXR3b3JrdHJhbnNhY3Rpb25fdW5pdHRlc3QucHk6CisgICAgICAgICAg LSBVcGRhdGVkIG1lY2hhbml6ZSBpbXBvcnQgc3RhdGVtZW50LgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9zdGF0dXNzZXJ2ZXIucHk6CisgICAgICAgICAgLSBVcGRhdGVkIG1lY2hhbml6 ZSBpbXBvcnQgc3RhdGVtZW50LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90aGlyZHBh cnR5L2F1dG9pbnN0YWxsZWQvX19pbml0X18ucHk6IEFkZGVkLgorICAgICAgICAgIC0gQ29waWVk IHRoZSBjb2RlIGZyb20gd2Via2l0cHkvX19pbml0X18ucHkgYW5kIHVwZGF0ZWQgaXQKKyAgICAg ICAgICAgIGFzIG5lY2Vzc2FyeS4KKwogMjAxMC0wMy0wMiAgR3VzdGF2byBOb3JvbmhhIFNpbHZh ICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBi eSBBbGV4ZXkgUHJvc2t1cnlha292LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9fX2luaXRfXy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvX19pbml0 X18ucHkKaW5kZXggZWZhOGM3YS4uYjM3NmJmMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9fX2luaXRfXy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L19faW5pdF9fLnB5CkBAIC0xLDggKzEsMTMgQEAKICMgUmVxdWlyZWQgZm9yIFB5dGhvbiB0 byBzZWFyY2ggdGhpcyBkaXJlY3RvcnkgZm9yIG1vZHVsZSBmaWxlcwogCi1pbXBvcnQgdGhpcmRw YXJ0eS5hdXRvaW5zdGFsbCBhcyBhdXRvaW5zdGFsbAotCi0jIExpc3Qgb3VyIHRoaXJkLXBhcnR5 IGxpYnJhcnkgZGVwZW5kZW5jaWVzIGhlcmUgYW5kIHdoZXJlIHRoZXkgY2FuIGJlCi0jIGRvd25s b2FkZWQuCi1hdXRvaW5zdGFsbC5iaW5kKCJDbGllbnRGb3JtIiwgImh0dHA6Ly9weXBpLnB5dGhv bi5vcmcvcGFja2FnZXMvc291cmNlL0MvQ2xpZW50Rm9ybS9DbGllbnRGb3JtLTAuMi4xMC56aXAi LCAiQ2xpZW50Rm9ybS0wLjIuMTAiKQotYXV0b2luc3RhbGwuYmluZCgibWVjaGFuaXplIiwgImh0 dHA6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL20vbWVjaGFuaXplL21lY2hhbml6 ZS0wLjEuMTEuemlwIiwgIm1lY2hhbml6ZS0wLjEuMTEiKQorIyBLZWVwIHRoaXMgZmlsZSBmcmVl IG9mIGFueSBjb2RlIG9yIGltcG9ydCBzdGF0ZW1lbnRzIHRoYXQgY291bGQKKyMgY2F1c2UgZWl0 aGVyIGFuIGVycm9yIHRvIG9jY3VyIG9yIGEgbG9nIG1lc3NhZ2UgdG8gYmUgbG9nZ2VkLgorIyBU aGlzIGVuc3VyZXMgdGhhdCBjYWxsaW5nIGNvZGUgY2FuIGltcG9ydCBpbml0aWFsaXphdGlvbiBj b2RlIGZyb20KKyMgd2Via2l0cHkgYmVmb3JlIGFueSBlcnJvcnMgb3IgbG9nIG1lc3NhZ2VzIGR1 ZSB0byBjb2RlIGluIHRoaXMgZmlsZS4KKyMgSW5pdGlhbGl6YXRpb24gY29kZSBjYW4gaW5jbHVk ZSB0aGluZ3MgbGlrZSB2ZXJzaW9uLWNoZWNraW5nIGNvZGUgYW5kCisjIGxvZ2dpbmcgY29uZmln dXJhdGlvbiBjb2RlLgorIworIyBXZSBkbyBub3QgZXhlY3V0ZSBhbnkgdmVyc2lvbi1jaGVja2lu ZyBjb2RlIG9yIGxvZ2dpbmcgY29uZmlndXJhdGlvbgorIyBjb2RlIGluIHRoaXMgZmlsZSBzbyB0 aGF0IGNhbGxlcnMgY2FuIG9wdC1pbiBhcyB0aGV5IHdhbnQuICBUaGlzIGFsc28KKyMgYWxsb3dz IGRpZmZlcmVudCBjYWxsZXJzIHRvIGNob29zZSBkaWZmZXJlbnQgaW5pdGlhbGl6YXRpb24gY29k ZSwKKyMgYXMgbmVjZXNzYXJ5LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9idWd6aWxsYS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYnVnemlsbGEu cHkKaW5kZXggMDBlNjk0MC4uYTYwYTcxOCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9idWd6aWxsYS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2J1Z3ppbGxhLnB5CkBAIC0zOSwxMyArMzksMTMgQEAgZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0 ZXRpbWUgIyB1c2VkIGluIHRpbWVzdGFtcCgpCiBmcm9tIHdlYmtpdHB5LndlYmtpdF9sb2dnaW5n IGltcG9ydCBlcnJvciwgbG9nCiBmcm9tIHdlYmtpdHB5LmNvbW1pdHRlcnMgaW1wb3J0IENvbW1p dHRlckxpc3QKIGZyb20gd2Via2l0cHkuY3JlZGVudGlhbHMgaW1wb3J0IENyZWRlbnRpYWxzCitm cm9tIHdlYmtpdHB5LnRoaXJkcGFydHkuYXV0b2luc3RhbGxlZCBpbXBvcnQgQnJvd3NlcgogZnJv bSB3ZWJraXRweS51c2VyIGltcG9ydCBVc2VyCiAKICMgV2ViS2l0IGluY2x1ZGVzIGEgYnVpbHQg Y29weSBvZiBCZWF1dGlmdWxTb3VwIGluIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eQogIyBz byB0aGlzIGltcG9ydCBzaG91bGQgYWx3YXlzIHN1Y2NlZWQuCiBmcm9tIHdlYmtpdHB5LnRoaXJk cGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRpZnVsU291cCwgU291cFN0cmFpbmVyCiAK LWZyb20gbWVjaGFuaXplIGltcG9ydCBCcm93c2VyCiAKIAogZGVmIHBhcnNlX2J1Z19pZChtZXNz YWdlKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbmV0d29ya3Ry YW5zYWN0aW9uLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9uZXR3b3JrdHJhbnNh Y3Rpb24ucHkKaW5kZXggZTA1M2JkNi4uMzEyMWVmNSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9uZXR3b3JrdHJhbnNhY3Rpb24ucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9uZXR3b3JrdHJhbnNhY3Rpb24ucHkKQEAgLTI4LDcgKzI4LDcgQEAK IAogaW1wb3J0IHRpbWUKIAotZnJvbSBtZWNoYW5pemUgaW1wb3J0IEhUVFBFcnJvcgorZnJvbSB3 ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQgaW1wb3J0IEhUVFBFcnJvcgogZnJvbSB3 ZWJraXRweS53ZWJraXRfbG9nZ2luZyBpbXBvcnQgbG9nCiAKIApkaWZmIC0tZ2l0IGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9uZXR3b3JrdHJhbnNhY3Rpb25fdW5pdHRlc3QucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L25ldHdvcmt0cmFuc2FjdGlvbl91bml0dGVzdC5w eQppbmRleCAzY2ZmZTAyLi5hYmVhNzA3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L25ldHdvcmt0cmFuc2FjdGlvbl91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L25ldHdvcmt0cmFuc2FjdGlvbl91bml0dGVzdC5weQpAQCAtMjgs OCArMjgsOCBAQAogCiBpbXBvcnQgdW5pdHRlc3QKIAotZnJvbSBtZWNoYW5pemUgaW1wb3J0IEhU VFBFcnJvcgogZnJvbSB3ZWJraXRweS5uZXR3b3JrdHJhbnNhY3Rpb24gaW1wb3J0IE5ldHdvcmtU cmFuc2FjdGlvbiwgTmV0d29ya1RpbWVvdXQKK2Zyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRv aW5zdGFsbGVkIGltcG9ydCBIVFRQRXJyb3IKIAogY2xhc3MgTmV0d29ya1RyYW5zYWN0aW9uVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZXhjZXB0aW9uID0gRXhjZXB0aW9uKCJUZXN0IGV4 Y2VwdGlvbiIpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0YXR1 c3NlcnZlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3RhdHVzc2VydmVyLnB5 CmluZGV4IDlhNTY3MDIuLjE0MjY5NzQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3RhdHVzc2VydmVyLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3RhdHVzc2VydmVyLnB5CkBAIC0yNyw4ICsyNyw4IEBACiAjIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIGZy b20gd2Via2l0cHkubmV0d29ya3RyYW5zYWN0aW9uIGltcG9ydCBOZXR3b3JrVHJhbnNhY3Rpb24K K2Zyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5hdXRvaW5zdGFsbGVkIGltcG9ydCBCcm93c2VyCiBm cm9tIHdlYmtpdHB5LndlYmtpdF9sb2dnaW5nIGltcG9ydCBsb2cKLWZyb20gbWVjaGFuaXplIGlt cG9ydCBCcm93c2VyCiAKICMgV2ViS2l0IGluY2x1ZGVzIGEgYnVpbHQgY29weSBvZiBCZWF1dGlm dWxTb3VwIGluIFNjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eQogIyBzbyB0aGlzIGltcG9ydCBz aG91bGQgYWx3YXlzIHN1Y2NlZWQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxlZC9fX2luaXRfXy5weSBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9hdXRvaW5zdGFsbGVkL19faW5pdF9fLnB5Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY3MzlhZGQKLS0tIC9kZXYvbnVsbAor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvYXV0b2luc3RhbGxl ZC9fX2luaXRfXy5weQpAQCAtMCwwICsxLDExIEBACisjIFJlcXVpcmVkIGZvciBQeXRob24gdG8g c2VhcmNoIHRoaXMgZGlyZWN0b3J5IGZvciBtb2R1bGUgZmlsZXMKKworaW1wb3J0IHdlYmtpdHB5 LnRoaXJkcGFydHkuYXV0b2luc3RhbGwgYXMgYXV0b2luc3RhbGwKKworIyBMaXN0IG91ciB0aGly ZC1wYXJ0eSBsaWJyYXJ5IGRlcGVuZGVuY2llcyBoZXJlIGFuZCB3aGVyZSB0aGV5IGNhbiBiZQor IyBkb3dubG9hZGVkLgorYXV0b2luc3RhbGwuYmluZCgiQ2xpZW50Rm9ybSIsICJodHRwOi8vcHlw aS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJjZS9DL0NsaWVudEZvcm0vQ2xpZW50Rm9ybS0wLjIu MTAuemlwIiwgIkNsaWVudEZvcm0tMC4yLjEwIikKK2F1dG9pbnN0YWxsLmJpbmQoIm1lY2hhbml6 ZSIsICJodHRwOi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJjZS9tL21lY2hhbml6ZS9t ZWNoYW5pemUtMC4xLjExLnppcCIsICJtZWNoYW5pemUtMC4xLjExIikKKworZnJvbSBtZWNoYW5p emUgaW1wb3J0IEJyb3dzZXIKK2Zyb20gbWVjaGFuaXplIGltcG9ydCBIVFRQRXJyb3IK