85407 2012-05-02 12:54:45 -0700 webkitpy: Remove direct sys.platform usage in the PNG checker. 2012-05-02 13:37:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 81560 1 rakuco rakuco abarth dpranke eric levin ojan rniwa tony webkit.review.bot oldest_to_newest 614554 0 rakuco 2012-05-02 12:54:45 -0700 webkitpy: Remove direct sys.platform usage in the PNG checker. 614562 1 139862 rakuco 2012-05-02 12:57:02 -0700 Created attachment 139862 Patch 614596 2 139862 tony 2012-05-02 13:24:42 -0700 Comment on attachment 139862 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139862&action=review > Tools/Scripts/webkitpy/style/checkers/png.py:99 > + if not self._platform.is_win(): > config_file_path = self._fs.join(self._fs.expanduser("~"), ".subversion/config") > - elif self._platform.startswith('win') or self._platform.startswith('cygwin'): > + else: > config_file_path = self._fs.join(os.environ['APPDATA'], "Subversion\config") Nit: I would put the platform.is_win case first, but this is also fine. 614612 3 rakuco 2012-05-02 13:37:29 -0700 Committed r115880: <http://trac.webkit.org/changeset/115880> 139862 2012-05-02 12:57:02 -0700 2012-05-02 13:24:41 -0700 Patch bug-85407-20120502165701.patch text/plain 6264 rakuco U3VidmVyc2lvbiBSZXZpc2lvbjogMTE1ODM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODlmZTUxZTU1ZDljMGQ1ODZlMTQyMzljMmE1ZjUzYzgy YzFkZTJkZi4uOGU5ZjA2ZGM1YmZlOWE1YmU3ZTMzNDExZWM2NTFmNzU4ZmE2OGUwMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTA1LTAyICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29Ad2Via2l0Lm9y Zz4KKworICAgICAgICB3ZWJraXRweTogUmVtb3ZlIGRpcmVjdCBzeXMucGxhdGZvcm0gdXNhZ2Ug aW4gdGhlIFBORyBjaGVja2VyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODU0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXb3JrIHRvd2FyZHMgcmVwbGFjaW5nIGRpcmVjdCBzeXMucGxhdGZvcm0gdXNh Z2Ugd2l0aAorICAgICAgICBQbGF0Zm9ybUluZm8uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX21vY2sucHk6CisgICAgICAgIChNb2NrUGxh dGZvcm1JbmZvLl9faW5pdF9fKTogQWNjZXB0IG9zX25hbWUgYW5kIG9zX3ZlcnNpb24gYXMKKyAg ICAgICAgYXJndW1lbnRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvcG5nLnB5OgorICAgICAgICAoUE5HQ2hlY2tlci5fX2luaXRfXyk6IENyZWF0ZSBhIFBsYXRm b3JtSW5mbyBvYmplY3QgaW5zdGVhZCBvZgorICAgICAgICB1c2luZyBzeXMucGxhdGZvcm0gd2hl biBuZWVkZWQuCisgICAgICAgIChQTkdDaGVja2VyLl9jb25maWdfZmlsZV9wYXRoKTogQ2hlY2sg Zm9yIHRoZSBjdXJyZW50IHBsYXRmb3JtIHZpYQorICAgICAgICBQbGF0Zm9ybUluZm8uCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9wbmdfdW5pdHRlc3QucHk6Cisg ICAgICAgIChQTkdDaGVja2VyVGVzdC50ZXN0X2NoZWNrKTogVXBkYXRlIHRlc3RzIGFmdGVyIHRo ZSBjaGFuZ2VzIGFib3ZlLgorCiAyMDEyLTA1LTAxICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxy YWt1Y29Ad2Via2l0Lm9yZz4KIAogICAgICAgICB3ZWJraXRweTogRml4IHN5cy5wbGF0Zm9ybSBj aGVjayBpbiBmaW5kX2ZpbGVzX3VuaXR0ZXN0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb19tb2NrLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb19tb2NrLnB5CmluZGV4IDczMDI3 NjFkZTBiZjJmMTlhNzMzZTI1OWQ2MWJkM2YxZmQyMmRjMzcuLmIyZGYzZjYxMjNiZTdmOWZhOTc5 YTkzNDg2Y2MxNmU0YTk2YzZiYjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fbW9jay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX21vY2sucHkKQEAgLTI4LDggKzI4LDkg QEAKIAogCiBjbGFzcyBNb2NrUGxhdGZvcm1JbmZvKG9iamVjdCk6Ci0gICAgb3NfbmFtZSA9ICdt YWMnCi0gICAgb3NfdmVyc2lvbiA9ICdzbm93bGVvcGFyZCcKKyAgICBkZWYgX19pbml0X18oc2Vs Ziwgb3NfbmFtZT0nbWFjJywgb3NfdmVyc2lvbj0nc25vd2xlb3BhcmQnKToKKyAgICAgICAgc2Vs Zi5vc19uYW1lID0gb3NfbmFtZQorICAgICAgICBzZWxmLm9zX3ZlcnNpb24gPSBvc192ZXJzaW9u CiAKICAgICBkZWYgaXNfbWFjKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5vc19uYW1lID09 ICdtYWMnCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L3BuZy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvcG5nLnB5Cmlu ZGV4IDBlOWJiNDhkNjkwNWEwY2I1MGE1NDc3MmUyYWJhYTAyY2JlYjcyODYuLjIwZjIxOGYwNGNi Mjc3N2EwZGU0ZDY1MjY2OTQyNTU5NTY3YzlkNDEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvcG5nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlcnMvcG5nLnB5CkBAIC0yNSwxMCArMjUsMTIgQEAKICIiIlN1cHBvcnRz IGNoZWNraW5nIFdlYktpdCBzdHlsZSBpbiBwbmcgZmlsZXMuIiIiCiAKIGltcG9ydCBvcworaW1w b3J0IHBsYXRmb3JtCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMKIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IEV4ZWN1dGl2ZQogZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLmZpbGVzeXN0ZW0gaW1wb3J0IEZpbGVTeXN0ZW0KK2Zyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5wbGF0Zm9ybWluZm8gaW1wb3J0IFBsYXRmb3JtSW5mbwogZnJvbSB3ZWJraXRweS5j b21tb24uY2hlY2tvdXQuc2NtLmRldGVjdGlvbiBpbXBvcnQgU0NNRGV0ZWN0b3IKIAogCkBAIC00 Miw3ICs0NCw3IEBAIGNsYXNzIFBOR0NoZWNrZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5faGFu ZGxlX3N0eWxlX2Vycm9yID0gaGFuZGxlX3N0eWxlX2Vycm9yCiAgICAgICAgIHNlbGYuX2ZzID0g ZmlsZXN5c3RlbSBvciBGaWxlU3lzdGVtKCkKICAgICAgICAgc2VsZi5fZGV0ZWN0b3IgPSBzY20g b3IgU0NNRGV0ZWN0b3Ioc2VsZi5fZnMsIEV4ZWN1dGl2ZSgpKS5kZXRlY3Rfc2NtX3N5c3RlbShz ZWxmLl9mcy5nZXRjd2QoKSkKLSAgICAgICAgc2VsZi5fcGxhdGZvcm0gPSBwbGF0Zm9ybSBvciBz eXMucGxhdGZvcm0KKyAgICAgICAgc2VsZi5fcGxhdGZvcm0gPSBwbGF0Zm9ybSBvciBQbGF0Zm9y bUluZm8oc3lzLCBwbGF0Zm9ybSwgRXhlY3V0aXZlKCkpCiAKICAgICBkZWYgY2hlY2soc2VsZiwg aW5saW5lPU5vbmUpOgogICAgICAgICBlcnJvcnN0ciA9ICIiCkBAIC05MSw4ICs5Myw4IEBAIGNs YXNzIFBOR0NoZWNrZXIob2JqZWN0KToKIAogICAgIGRlZiBfY29uZmlnX2ZpbGVfcGF0aChzZWxm KToKICAgICAgICAgY29uZmlnX2ZpbGUgPSAiIgotICAgICAgICBpZiBzZWxmLl9wbGF0Zm9ybS5z dGFydHN3aXRoKCdsaW51eCcpIG9yIHNlbGYuX3BsYXRmb3JtLnN0YXJ0c3dpdGgoJ2Rhcndpbicp OgorICAgICAgICBpZiBub3Qgc2VsZi5fcGxhdGZvcm0uaXNfd2luKCk6CiAgICAgICAgICAgICBj b25maWdfZmlsZV9wYXRoID0gc2VsZi5fZnMuam9pbihzZWxmLl9mcy5leHBhbmR1c2VyKCJ+Iiks ICIuc3VidmVyc2lvbi9jb25maWciKQotICAgICAgICBlbGlmIHNlbGYuX3BsYXRmb3JtLnN0YXJ0 c3dpdGgoJ3dpbicpIG9yIHNlbGYuX3BsYXRmb3JtLnN0YXJ0c3dpdGgoJ2N5Z3dpbicpOgorICAg ICAgICBlbHNlOgogICAgICAgICAgICAgY29uZmlnX2ZpbGVfcGF0aCA9IHNlbGYuX2ZzLmpvaW4o b3MuZW52aXJvblsnQVBQREFUQSddLCAiU3VidmVyc2lvblxjb25maWciKQogICAgICAgICByZXR1 cm4gY29uZmlnX2ZpbGVfcGF0aApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy9wbmdfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXJzL3BuZ191bml0dGVzdC5weQppbmRleCAzYzA5NjEwOTJjZGExMGJjMWNlN2Mz NTBkY2I5MjA3ZTU3ZDY4NjcwLi4xMWRjYWQwMzYwNjUwZWEzMzllNDViYTczMWIzYWNmNDhjZTVj NzRiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Bu Z191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJz L3BuZ191bml0dGVzdC5weQpAQCAtMjYsNiArMjYsNyBAQAogaW1wb3J0IHVuaXR0ZXN0CiBmcm9t IHBuZyBpbXBvcnQgUE5HQ2hlY2tlcgogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmZpbGVz eXN0ZW1fbW9jayBpbXBvcnQgTW9ja0ZpbGVTeXN0ZW0KK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5 c3RlbS5wbGF0Zm9ybWluZm9fbW9jayBpbXBvcnQgTW9ja1BsYXRmb3JtSW5mbwogCiAKIGNsYXNz IE1vY2tTQ01EZXRlY3RvcihvYmplY3QpOgpAQCAtNzgsNyArNzksNyBAQCBjbGFzcyBQTkdDaGVj a2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGZzID0gTW9ja0ZpbGVTeXN0ZW0o ZmlsZXMpCiAgICAgICAgIHNjbSA9IE1vY2tTQ01EZXRlY3RvcignZ2l0JykKICAgICAgICAgZXJy b3JzID0gW10KLSAgICAgICAgY2hlY2tlciA9IFBOR0NoZWNrZXIoImNvbmZpZyIsIG1vY2tfaGFu ZGxlX3N0eWxlX2Vycm9yLCBmcywgc2NtLCBwbGF0Zm9ybT0nbGludXgnKQorICAgICAgICBjaGVj a2VyID0gUE5HQ2hlY2tlcigiY29uZmlnIiwgbW9ja19oYW5kbGVfc3R5bGVfZXJyb3IsIGZzLCBz Y20sIE1vY2tQbGF0Zm9ybUluZm8oJ2xpbnV4JywgJ2x1Y2lkJykpCiAgICAgICAgIGNoZWNrZXIu Y2hlY2soKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4oZXJyb3JzKSwgMCkKIApAQCAt ODYsNyArODcsNyBAQCBjbGFzcyBQTkdDaGVja2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAg ICAgICAgIGZzID0gTW9ja0ZpbGVTeXN0ZW0oZmlsZXMpCiAgICAgICAgIHNjbSA9IE1vY2tTQ01E ZXRlY3RvcignZ2l0JykKICAgICAgICAgZXJyb3JzID0gW10KLSAgICAgICAgY2hlY2tlciA9IFBO R0NoZWNrZXIoImNvbmZpZyIsIG1vY2tfaGFuZGxlX3N0eWxlX2Vycm9yLCBmcywgc2NtLCBwbGF0 Zm9ybT0nbGludXgnKQorICAgICAgICBjaGVja2VyID0gUE5HQ2hlY2tlcigiY29uZmlnIiwgbW9j a19oYW5kbGVfc3R5bGVfZXJyb3IsIGZzLCBzY20sIE1vY2tQbGF0Zm9ybUluZm8oJ2xpbnV4Jywg J2x1Y2lkJykpCiAgICAgICAgIGNoZWNrZXIuY2hlY2soKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFscyhsZW4oZXJyb3JzKSwgMSkKIApAQCAtOTQsNyArOTUsNyBAQCBjbGFzcyBQTkdDaGVja2Vy VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGZzID0gTW9ja0ZpbGVTeXN0ZW0oZmls ZXMpCiAgICAgICAgIHNjbSA9IE1vY2tTQ01EZXRlY3RvcignZ2l0JykKICAgICAgICAgZXJyb3Jz ID0gW10KLSAgICAgICAgY2hlY2tlciA9IFBOR0NoZWNrZXIoImNvbmZpZyIsIG1vY2tfaGFuZGxl X3N0eWxlX2Vycm9yLCBmcywgc2NtLCBwbGF0Zm9ybT0nbGludXgnKQorICAgICAgICBjaGVja2Vy ID0gUE5HQ2hlY2tlcigiY29uZmlnIiwgbW9ja19oYW5kbGVfc3R5bGVfZXJyb3IsIGZzLCBzY20s IE1vY2tQbGF0Zm9ybUluZm8oJ2xpbnV4JywgJ2x1Y2lkJykpCiAgICAgICAgIGNoZWNrZXIuY2hl Y2soKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhsZW4oZXJyb3JzKSwgMCkKIApAQCAtMTAy LDcgKzEwMyw3IEBAIGNsYXNzIFBOR0NoZWNrZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgZnMgPSBNb2NrRmlsZVN5c3RlbShmaWxlcykKICAgICAgICAgc2NtID0gTW9ja1NDTURl dGVjdG9yKCdnaXQnKQogICAgICAgICBlcnJvcnMgPSBbXQotICAgICAgICBjaGVja2VyID0gUE5H Q2hlY2tlcigiY29uZmlnIiwgbW9ja19oYW5kbGVfc3R5bGVfZXJyb3IsIGZzLCBzY20sIHBsYXRm b3JtPSdsaW51eCcpCisgICAgICAgIGNoZWNrZXIgPSBQTkdDaGVja2VyKCJjb25maWciLCBtb2Nr X2hhbmRsZV9zdHlsZV9lcnJvciwgZnMsIHNjbSwgTW9ja1BsYXRmb3JtSW5mbygnbGludXgnLCAn bHVjaWQnKSkKICAgICAgICAgY2hlY2tlci5jaGVjaygpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKGxlbihlcnJvcnMpLCAwKQogCkBAIC0xMTAsNyArMTExLDcgQEAgY2xhc3MgUE5HQ2hlY2tl clRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBmcyA9IE1vY2tGaWxlU3lzdGVtKGZp bGVzKQogICAgICAgICBzY20gPSBNb2NrU0NNRGV0ZWN0b3IoJ2dpdCcpCiAgICAgICAgIGVycm9y cyA9IFtdCi0gICAgICAgIGNoZWNrZXIgPSBQTkdDaGVja2VyKCJjb25maWciLCBtb2NrX2hhbmRs ZV9zdHlsZV9lcnJvciwgZnMsIHNjbSwgcGxhdGZvcm09J2xpbnV4JykKKyAgICAgICAgY2hlY2tl ciA9IFBOR0NoZWNrZXIoImNvbmZpZyIsIG1vY2tfaGFuZGxlX3N0eWxlX2Vycm9yLCBmcywgc2Nt LCBNb2NrUGxhdGZvcm1JbmZvKCdsaW51eCcsICdsdWNpZCcpKQogICAgICAgICBjaGVja2VyLmNo ZWNrKCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMobGVuKGVycm9ycyksIDEpCiAK