Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/issueentry.py b/tracker/issueentry.py
index 77de114..2ae59d8 100644
--- a/tracker/issueentry.py
+++ b/tracker/issueentry.py
@@ -18,6 +18,7 @@
 from features import hotlist_helpers
 from features import send_notifications
 from framework import exceptions
+from framework import flaskservlet
 from framework import framework_bizobj
 from framework import framework_constants
 from framework import framework_helpers
@@ -45,7 +46,7 @@
   """IssueEntry shows a page with a simple form to enter a new issue."""
 
   _PAGE_TEMPLATE = 'tracker/issue-entry-page.ezt'
-  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ISSUES
+  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ISSUES
 
   # The issue filing wizard is a separate app that posted back to Monorail's
   # issue entry page. To make this possible for the wizard, we need to allow
@@ -511,6 +512,12 @@
 
     return template
 
+  # def GetIssueEntry(self, **kwargs):
+  #   return self.handler(**kwargs)
+
+  # def PostIssueEntry(self, **kwargs):
+  #   return self.handler(**kwargs)
+
 
 def _AttachDefaultApprovers(config, approval_values):
   approval_defs_by_id = {ad.approval_id: ad for ad in config.approval_defs}