Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/groupadmin.py b/sitewide/groupadmin.py
index 09593e0..1fdfcfe 100644
--- a/sitewide/groupadmin.py
+++ b/sitewide/groupadmin.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 user group admin page."""
from __future__ import print_function
@@ -13,17 +12,16 @@
import ezt
-from framework import flaskservlet
from framework import framework_helpers
from framework import permissions
from framework import servlet
from framework import urls
-from proto import usergroup_pb2
+from mrproto import usergroup_pb2
from services import usergroup_svc
from sitewide import group_helpers
-class GroupAdmin(flaskservlet.FlaskServlet):
+class GroupAdmin(servlet.Servlet):
"""The group admin page."""
_PAGE_TEMPLATE = 'sitewide/group-admin-page.ezt'