Remove invalid-string-quote from //testing
Removes the invalid-string-quote disable from the //testing pylintrc
file and fixes all resulting errors.
Bug: 353942917
Change-Id: I4e8ef60d4f7b7645fee7ee86d579032bb0c24eb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5784807
Commit-Queue: Ben Pastene <[email protected]>
Auto-Submit: Brian Sheedy <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Commit-Queue: Brian Sheedy <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1341341}
diff --git a/testing/merge_scripts/results_merger.py b/testing/merge_scripts/results_merger.py
index 5085154..bf7e9566 100755
--- a/testing/merge_scripts/results_merger.py
+++ b/testing/merge_scripts/results_merger.py
@@ -195,9 +195,9 @@
if k in dest_node:
if not isinstance(v, dict):
raise MergeException(
- "%s:%s: %r not mergable, curr_node: %r\ndest_node: %r" %
+ '%s:%s: %r not mergable, curr_node: %r\ndest_node: %r' %
(prefix, k, v, curr_node, dest_node))
- pending_nodes.append(("%s:%s" % (prefix, k), dest_node[k], v))
+ pending_nodes.append(('%s:%s' % (prefix, k), dest_node[k], v))
else:
dest_node[k] = v
return dest
@@ -248,7 +248,7 @@
try:
dest[key] = merge_func(source[key], dest[key])
except MergeException as e:
- message = "MergeFailure for %s\n%s" % (key, e.args[0])
+ message = 'MergeFailure for %s\n%s' % (key, e.args[0])
e.args = (message, ) + e.args[1:]
raise
del source[key]
@@ -256,7 +256,7 @@
def main(files):
if len(files) < 2:
- sys.stderr.write("Not enough JSON files to merge.\n")
+ sys.stderr.write('Not enough JSON files to merge.\n')
return 1
sys.stderr.write('Starting with %s\n' % files[0])
result = json.load(open(files[0]))
@@ -267,5 +267,5 @@
return 0
-if __name__ == "__main__":
+if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))
