Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/usersettings.py b/sitewide/usersettings.py
index 163d731..67c8cea 100644
--- a/sitewide/usersettings.py
+++ b/sitewide/usersettings.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.
"""Classes for the user settings (preferences) page."""
from __future__ import print_function
@@ -14,14 +13,14 @@
import ezt
from businesslogic import work_env
-from framework import flaskservlet
from framework import framework_helpers
from framework import permissions
+from framework import servlet
from framework import template_helpers
from framework import urls
-class UserSettings(flaskservlet.FlaskServlet):
+class UserSettings(servlet.Servlet):
"""Shows a page with a simple form to edit user preferences."""
_PAGE_TEMPLATE = 'sitewide/user-settings-page.ezt'