Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/banned.py b/framework/banned.py
index 209a715..5a4cd07 100644
--- a/framework/banned.py
+++ b/framework/banned.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 the a message explaining that the user has been banned.
 
@@ -18,11 +17,11 @@
 
 import ezt
 
-from framework import flaskservlet, permissions
+from framework import permissions
 from framework import servlet
 
 
-class Banned(flaskservlet.FlaskServlet):
+class Banned(servlet.Servlet):
   """The Banned page shows a message explaining that the user is banned."""
 
   _PAGE_TEMPLATE = 'framework/banned-page.ezt'