Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/services/project_svc.py b/services/project_svc.py
index e92f6a9..00ad219 100644
--- a/services/project_svc.py
+++ b/services/project_svc.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.
"""A set of functions that provide persistence for projects.
@@ -27,7 +26,7 @@
from framework import sql
from services import caches
from project import project_helpers
-from proto import project_pb2
+from mrproto import project_pb2
PROJECT_TABLE_NAME = 'Project'
@@ -321,9 +320,9 @@
return projects_dict
- def GetVisibleLiveProjects(
+ def GetVisibleProjects(
self, cnxn, logged_in_user, effective_ids, domain=None, use_cache=True):
- """Return all user visible live project ids.
+ """Return all user visible project ids.
Args:
cnxn: connection to SQL database.
@@ -334,7 +333,7 @@
buffers.
Returns:
- A list of project ids of user visible live projects sorted by the names
+ A list of project ids of user visible projects sorted by the names
of the projects. If host was provided, only projects with that host
as their branded domain will be returned.
"""
@@ -599,7 +598,7 @@
elif role_name == 'contributor':
contrib_project_ids.add(project_id)
else:
- logging.warn('Unexpected role name %r', role_name)
+ logging.warning('Unexpected role name %r', role_name)
return owned_project_ids, membered_project_ids, contrib_project_ids