Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/tracker_constants.py b/tracker/tracker_constants.py
index e0fe1b2..bbe242b 100644
--- a/tracker/tracker_constants.py
+++ b/tracker/tracker_constants.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.
"""Some constants used in Monorail issue tracker pages."""
from __future__ import print_function
@@ -10,7 +9,7 @@
import re
-from proto import user_pb2
+from mrproto import user_pb2
# Default columns shown on issue list page, and other built-in cols.
@@ -75,7 +74,7 @@
# Pattern for matching a full component name, not just a single leaf.
# Allows any number of repeating valid leaf names separated by ">" characters.
-COMPONENT_PATH_PATTERN = '%s(\>%s)*' % (
+COMPONENT_PATH_PATTERN = r'%s(\>%s)*' % (
COMPONENT_LEAF_PATTERN, COMPONENT_LEAF_PATTERN)
# Regular expression used to validate new field names.