Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/groupcreate.py b/sitewide/groupcreate.py
index 2c0ece7..9ac2d15 100644
--- a/sitewide/groupcreate.py
+++ b/sitewide/groupcreate.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 page for site admins to create a new user group."""
from __future__ import print_function
@@ -11,14 +10,15 @@
import logging
import re
-from framework import exceptions, flaskservlet
+from framework import exceptions
from framework import framework_helpers
from framework import permissions
-from proto import usergroup_pb2
+from framework import servlet
+from mrproto import usergroup_pb2
from sitewide import group_helpers
-class GroupCreate(flaskservlet.FlaskServlet):
+class GroupCreate(servlet.Servlet):
"""Shows a page with a simple form to create a user group."""
_PAGE_TEMPLATE = 'sitewide/group-create-page.ezt'