76481 2012-01-17 14:48:33 -0800 webkitpy: fix json import in json_results_generator_unittest.py 2012-01-17 18:46:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan oldest_to_newest 537365 0 dpranke 2012-01-17 14:48:33 -0800 webkitpy: fix json import on linux 537366 1 122816 dpranke 2012-01-17 14:49:33 -0800 Created attachment 122816 Patch 537378 2 dpranke 2012-01-17 15:08:35 -0800 ick ... okay, the distribution of python on my linux box seems to point to some glacially old version of simplejson that does actually have a speedups.so compiled, so when we load the version in thirdparty/simplejson, it picks up an old speedups.so and explodes. Note that the import in simplejson/encoder.py is "from simplejson import _speedups"; since our module is known as "webkitpy.thirdparty.simplejson" this is how we end up getting the wrong version here. importing json directly is probably the right way to avoid this version skew. 537380 3 dpranke 2012-01-17 15:10:56 -0800 Committed r105199: <http://trac.webkit.org/changeset/105199> 537550 4 eric 2012-01-17 18:46:42 -0800 We're about to remove support for 2.5 anyway. :) 122816 2012-01-17 14:49:33 -0800 2012-01-17 14:50:31 -0800 Patch bug-76481-20120117144932.patch text/plain 2157 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1MTk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTZhMjYxM2Q4YWU1NTAxZTE0OGE1ZDVmNmQ1OTMyM2U0 ZGE4MzNiNi4uNzQ3YjdhYjM2MmY5YjI1ZWUxMWYzZTE3NGJkNjMzMDA4MGQ2ZTlkZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDEyLTAxLTE3ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBmaXgganNvbiBpbXBvcnQgb24gbGludXgKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc2NDgxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIHNvbWUgcmVhc29uLCB0aGUgdmVy c2lvbiBvZiBzaW1wbGVqc29uIGF1dG9pbnN0YWxsZWQgb24gbXkgbGludXgKKyAgICAgICAgYm94 IHNlZW1zIHRvIGJlIGJyb2tlbi4gV2Ugc2hvdWxkIHJlYWxseSBvbmx5IGJlIHVzaW5nCisgICAg ICAgIHNpbXBsZWpzb24gaWYganNvbiBpc24ndCBhdmFpbGFibGUgYW55d2F5LCBzbyB0aGlzIGNo YW5nZSBsb29rcworICAgICAgICBmb3IganNvbiBmaXJzdC4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0 b3JfdW5pdHRlc3QucHk6CisgICAgICAgIChKU09OR2VuZXJhdG9yVGVzdC50ZXN0X3Rlc3RfdGlt aW5nc190cmllKToKKworMjAxMi0wMS0xNyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVt Lm9yZz4KKwogICAgICAgICBGaXggZmFpbHVyZXMgaW4gdGVzdC13ZWJraXRweSBjYXVzZWQgYnkg cjEwNTE3Ny4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jl c3VsdHNfZ2VuZXJhdG9yX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvcl91bml0dGVzdC5w eQppbmRleCBiM2U1Y2JjZDg4YzU3ZWVlZjcxNWQ0OWE5MjYwY2MwMzYwNjNiMzM2Li5iMDAxMTk4 MjFhNjY1ZjVhMjE2MjBjYTViZDUxMDllYjAzM2EwYjJmIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2Vu ZXJhdG9yX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3JfdW5pdHRlc3QucHkKQEAg LTM3LDcgKzM3LDExIEBAIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmxheW91dF9wYWNrYWdl IGltcG9ydCBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0 cy5tb2RlbHMgaW1wb3J0IHRlc3RfZXhwZWN0YXRpb25zCiBmcm9tIHdlYmtpdHB5LmxheW91dF90 ZXN0cy5wb3J0IGltcG9ydCB0ZXN0CiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9jayBpbXBv cnQgTW9jawotZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5IGltcG9ydCBzaW1wbGVqc29uCisKK3Ry eToKKyAgICBpbXBvcnQganNvbgorZXhjZXB0IEltcG9ydEVycm9yLCBlOgorICAgIGZyb20gd2Vi a2l0cHkudGhpcmRwYXJ0eSBpbXBvcnQgc2ltcGxlanNvbiBhcyBqc29uCiAKIGNsYXNzIEpTT05H ZW5lcmF0b3JUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgc2V0VXAoc2VsZik6CkBA IC0yMjksOCArMjMzLDcgQEAgY2xhc3MgSlNPTkdlbmVyYXRvclRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c2ltcGxlanNvbi5kdW1wcyh0cmllKSwgc2ltcGxlanNvbi5kdW1wcyhleHBlY3RlZF90cmllKSkK LQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGpzb24uZHVtcHModHJpZSksIGpzb24uZHVtcHMo ZXhwZWN0ZWRfdHJpZSkpCiAKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK