diff options
| author | Hubert Tong <hubert.reinterpretcast@gmail.com> | 2019-09-16 00:09:01 +0000 |
|---|---|---|
| committer | Hubert Tong <hubert.reinterpretcast@gmail.com> | 2019-09-16 00:09:01 +0000 |
| commit | b565629825431b90ec6ceaced91b03cca50632bf (patch) | |
| tree | fca25d112e361c0fba44abdbbb0535df4f72aa3c /lnt/server | |
| parent | dc3812628809a9952b190f20b1533b7e2aa008f5 (diff) | |
[LNT] Python 3 support: Remove implicit tuple parameter unpacking on lambdas
Summary:
Lambda changes split out and updated from D67535.
Applies the `2to3 -f tuple_params` fixes, tweaks the variable naming,
and updates the affected tuples to be named tuples.
Reviewers: cmatthews, thopre, kristof.beyls
Reviewed By: thopre
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D67582
git-svn-id: https://llvm.org/svn/llvm-project/lnt/trunk@371947 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lnt/server')
| -rw-r--r-- | lnt/server/reporting/runs.py | 8 | ||||
| -rw-r--r-- | lnt/server/ui/views.py | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/lnt/server/reporting/runs.py b/lnt/server/reporting/runs.py index 9eb19b5..92bb99f 100644 --- a/lnt/server/reporting/runs.py +++ b/lnt/server/reporting/runs.py @@ -2,6 +2,7 @@ Report functionality centered around individual runs. """ +from collections import namedtuple import time import lnt.server.reporting.analysis import lnt.server.ui.app @@ -123,7 +124,9 @@ def generate_run_data(session, run, baseurl, num_comparison_runs=0, if not bucket or bucket_name == 'Unchanged Test' or not show_perf: return bucket else: - return sorted(bucket, key=lambda (_, cr, __): -abs(cr.pct_delta)) + return sorted( + bucket, + key=lambda bucket_entry: -abs(bucket_entry.cr.pct_delta)) def prioritize_buckets(test_results): prioritized = [(priority, field, bucket_name, @@ -212,6 +215,7 @@ def generate_run_data(session, run, baseurl, num_comparison_runs=0, return data +BucketEntry = namedtuple('BucketEntry', ['name', 'cr', 'test_id']) def _get_changes_by_type(ts, run_a, run_b, metric_fields, test_names, num_comparison_runs, sri): comparison_results = {} @@ -249,7 +253,7 @@ def _get_changes_by_type(ts, run_a, run_b, metric_fields, test_names, else: bucket = unchanged_tests - bucket.append((name, cr, test_id)) + bucket.append(BucketEntry(name, cr, test_id)) results_by_type.append( (field, (('New Failures', new_failures, False), diff --git a/lnt/server/ui/views.py b/lnt/server/ui/views.py index 6c72a5d..93333da 100644 --- a/lnt/server/ui/views.py +++ b/lnt/server/ui/views.py @@ -799,6 +799,8 @@ def v4_graph(): show_highlight = not options['hide_highlight'] # Load the graph parameters. + GraphParameter = namedtuple('GraphParameter', + ['machine', 'test', 'field', 'field_index']) graph_parameters = [] for name, value in request.args.items(): # Plots to graph are passed as:: @@ -827,10 +829,12 @@ def v4_graph(): field = ts.sample_fields[field_index] except NoResultFound: return abort(404) - graph_parameters.append((machine, test, field, field_index)) + graph_parameters.append(GraphParameter(machine, test, field, field_index)) # Order the plots by machine name, test name and then field. - graph_parameters.sort(key=lambda (m, t, f, _): (m.name, t.name, f.name, _)) + graph_parameters.sort(key=lambda graph_parameter: + (graph_parameter.machine.name, graph_parameter.test.name, + graph_parameter.field.name, graph_parameter.field_index)) # Extract requested mean trend. mean_parameter = None |