Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/groupdetail.py b/sitewide/groupdetail.py
index 1f16a0a..7dfa983 100644
--- a/sitewide/groupdetail.py
+++ b/sitewide/groupdetail.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 class to display a user group, including a paginated list of members."""
from __future__ import print_function
@@ -14,21 +13,20 @@
import ezt
from framework import exceptions
-from framework import flaskservlet
from framework import framework_helpers
from framework import framework_views
from framework import paginate
from framework import permissions
from framework import servlet
from project import project_helpers
-from proto import usergroup_pb2
+from mrproto import usergroup_pb2
from sitewide import group_helpers
from sitewide import sitewide_views
MEMBERS_PER_PAGE = 50
-class GroupDetail(flaskservlet.FlaskServlet):
+class GroupDetail(servlet.Servlet):
"""The group detail page presents information about one user group."""
_PAGE_TEMPLATE = 'sitewide/group-detail-page.ezt'