Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/framework_bizobj.py b/framework/framework_bizobj.py
index bacaec5..77a70ac 100644
--- a/framework/framework_bizobj.py
+++ b/framework/framework_bizobj.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.
"""Business objects for Monorail's framework.
@@ -22,7 +21,7 @@
import settings
from framework import exceptions
from framework import framework_constants
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from services import client_config_svc
@@ -30,7 +29,7 @@
RE_COLUMN_NAME = r'\w+[\w+-.]*\w+'
# Compiled regexp to match a valid column specification.
-RE_COLUMN_SPEC = re.compile('(%s(\s%s)*)*$' % (RE_COLUMN_NAME, RE_COLUMN_NAME))
+RE_COLUMN_SPEC = re.compile(r'(%s(\s%s)*)*$' % (RE_COLUMN_NAME, RE_COLUMN_NAME))
def WhichUsersShareAProject(cnxn, services, user_effective_ids, other_users):