Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/projectupdates.py b/project/projectupdates.py
index 304b435..7a0928a 100644
--- a/project/projectupdates.py
+++ b/project/projectupdates.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 paginated list of activity stream updates."""
 from __future__ import print_function
@@ -10,10 +9,7 @@
 
 import logging
 
-import ezt
-
 from features import activities
-from framework import flaskservlet
 from framework import servlet
 from framework import urls
 
@@ -22,7 +18,7 @@
   """ProjectUpdates page shows a list of past activities."""
 
   _PAGE_TEMPLATE = 'project/project-updates-page.ezt'
-  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_UPDATES
+  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_UPDATES
 
   def GatherPageData(self, mr):
     """Build up a dictionary of data values to use when rendering the page."""
@@ -42,5 +38,5 @@
         ending='by_user', updates_page_url=url,
         autolink=self.services.autolink)
 
-  # def GetProjectUpdatesPage(self, **kwargs):
-  #   return self.handler(**kwargs)
\ No newline at end of file
+  def GetProjectUpdatesPage(self, **kwargs):
+    return self.handler(**kwargs)