Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/project_helpers.py b/project/project_helpers.py
index 23a2d46..3d02a2b 100644
--- a/project/project_helpers.py
+++ b/project/project_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.
"""Helper functions and classes used by the project pages."""
from __future__ import print_function
@@ -20,7 +19,7 @@
from framework import permissions
from project import project_constants
from project import project_views
-from proto import project_pb2
+from mrproto import project_pb2
_RE_EMAIL_SEPARATORS = re.compile(r'\s|,|;')
@@ -231,6 +230,6 @@
def AllProjectMembers(project):
- # type: (proto.project_pb2.Project) -> Sequence[int]
+ # type: (mrproto.project_pb2.Project) -> Sequence[int]
"""Return a list of user IDs of all members in the given project."""
return project.owner_ids + project.committer_ids + project.contributor_ids