Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/search/backendnonviewable.py b/search/backendnonviewable.py
index ab751a4..21f1189 100644
--- a/search/backendnonviewable.py
+++ b/search/backendnonviewable.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.
"""Servlet that searches for issues that the specified user cannot view.
@@ -37,7 +36,7 @@
NONVIEWABLE_MEMCACHE_EXPIRATION = 15 * framework_constants.SECS_PER_MINUTE
-class BackendNonviewable(jsonfeed.FlaskInternalTask):
+class BackendNonviewable(jsonfeed.InternalTask):
"""JSON servlet for getting issue IDs that the specified user cannot view."""
CHECK_SAME_APP = True
@@ -114,7 +113,7 @@
def GetAtRiskIIDs(
self, cnxn, user, effective_ids, project, perms, shard_id):
- # type: (MonorailConnection, proto.user_pb2.User, Sequence[int], Project,
+ # type: (MonorailConnection, mrproto.user_pb2.User, Sequence[int], Project,
# permission_objects_pb2.PermissionSet, int) -> Sequence[int]
"""Return IIDs of restricted issues that user might not be able to view."""
at_risk_label_ids = search_helpers.GetPersonalAtRiskLabelIDs(