Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/table_view_helpers.py b/framework/table_view_helpers.py
index 3fa07c2..f81ba40 100644
--- a/framework/table_view_helpers.py
+++ b/framework/table_view_helpers.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Classes and functions for displaying lists of project artifacts.
@@ -24,7 +23,7 @@
from framework import framework_constants
from framework import template_helpers
from framework import timestr
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from tracker import tracker_bizobj
from tracker import tracker_constants
@@ -697,8 +696,8 @@
if not fd:
# TODO(jrobbins): This can happen if an issue with a custom
# field value is moved to a different project.
- logging.warn('Issue ID %r has undefined field value %r',
- art.issue_id, fv)
+ logging.warning(
+ 'Issue ID %r has undefined field value %r', art.issue_id, fv)
elif fd.field_name.lower() == col and (
phase_names_by_id.get(fv.phase_id) == phase_name):
if fd.field_type == tracker_pb2.FieldTypes.URL_TYPE:
@@ -726,8 +725,8 @@
fd = tracker_bizobj.FindFieldDef(col, config)
ad = tracker_bizobj.FindApprovalDef(col, config)
if not (ad and fd):
- logging.warn('Issue ID %r has undefined field value %r',
- art.issue_id, av)
+ logging.warning(
+ 'Issue ID %r has undefined field value %r', art.issue_id, av)
elif av.approval_id == fd.field_id:
explicit_values.append(av.status.name)
break
@@ -745,8 +744,8 @@
fd = tracker_bizobj.FindFieldDef(approval_name, config)
ad = tracker_bizobj.FindApprovalDef(approval_name, config)
if not (ad and fd):
- logging.warn('Issue ID %r has undefined field value %r',
- art.issue_id, av)
+ logging.warning(
+ 'Issue ID %r has undefined field value %r', art.issue_id, av)
elif av.approval_id == fd.field_id:
explicit_values = [users_by_id.get(approver_id).display_name
for approver_id in av.approver_ids