Reland "[CodeHealth] Migrate multiple presubmit checks from Python2 to Python3"
This is a reland of I9a4c27d845e2f87cd0a609953f5ed4bfe4b6cef0
This reland differs from the original CL in that it focuses only on
migrating files under testing/merge_scripts, while opting to suppress
pylint warnings that are Python3 style related, but non-breaking, and
using the six library to support cross-compatibility between
Python 2 and 3.
Original change's description:
>[CodeHealth] Migrate multiple presubmit checks from Python2 to Python3
>
>and fixed resulting errors.
>
>Bug: 1223892
>Change-Id: I9a4c27d845e2f87cd0a609953f5ed4bfe4b6cef0
>Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3234222
>Reviewed-by: Kenneth Russell <[email protected]>
>Reviewed-by: Brian Sheedy <[email protected]>
>Reviewed-by: Dirk Pranke <[email protected]>
>Commit-Queue: Joshua Hood <[email protected]>
>Cr-Commit-Position: refs/heads/main@{#956234}
Bug: 1223892, 1262364
Change-Id: I2b2fb2f1789554eb21b5569426e92b8fe739a126
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401701
Reviewed-by: Mike Pinkerton <[email protected]>
Reviewed-by: Stephen Martinis <[email protected]>
Commit-Queue: Joshua Hood <[email protected]>
Cr-Commit-Position: refs/heads/main@{#976893}
diff --git a/testing/merge_scripts/results_merger.py b/testing/merge_scripts/results_merger.py
index 3c05dfe..4bb9f636 100755
--- a/testing/merge_scripts/results_merger.py
+++ b/testing/merge_scripts/results_merger.py
@@ -69,8 +69,8 @@
if 'seconds_since_epoch' in shard_results_list[0]:
return _merge_json_test_result_format(shard_results_list)
- else:
- return _merge_simplified_json_format(shard_results_list)
+
+ return _merge_simplified_json_format(shard_results_list)
def _merge_simplified_json_format(shard_results_list):
@@ -261,8 +261,8 @@
try:
dest[key] = merge_func(source[key], dest[key])
except MergeException as e:
- e.message = "MergeFailure for %s\n%s" % (key, e.message)
- e.args = tuple([e.message] + list(e.args[1:]))
+ message = "MergeFailure for %s\n%s" % (key, e.args[0])
+ e.args = (message,) + e.args[1:]
raise
del source[key]
