Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/sitewide/moved.py b/sitewide/moved.py
index 8c2935f..0be5c37 100644
--- a/sitewide/moved.py
+++ b/sitewide/moved.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 message explaining that a project has moved.
 
@@ -13,14 +12,14 @@
 
 import logging
 
-from framework import exceptions, flaskservlet
+from framework import exceptions
 from framework import framework_helpers
 from framework import servlet
 from framework import urls
 from project import project_constants
 
 
-class ProjectMoved(flaskservlet.FlaskServlet):
+class ProjectMoved(servlet.Servlet):
   """The ProjectMoved page explains that the project has moved."""
 
   _PAGE_TEMPLATE = 'sitewide/moved-page.ezt'