Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/issuereindex.py b/tracker/issuereindex.py
index de5d2f0..71acfe8 100644
--- a/tracker/issuereindex.py
+++ b/tracker/issuereindex.py
@@ -9,9 +9,10 @@
 from __future__ import absolute_import
 
 import logging
-import urllib
+from six.moves import urllib
 
 import settings
+from framework import flaskservlet
 from framework import permissions
 from framework import servlet
 from framework import urls
@@ -22,7 +23,7 @@
   """IssueReindex shows a form to request that issues be indexed."""
 
   _PAGE_TEMPLATE = 'tracker/issue-reindex-page.ezt'
-  _MAIN_TAB_MODE = servlet.Servlet.MAIN_TAB_ISSUES
+  _MAIN_TAB_MODE = flaskservlet.FlaskServlet.MAIN_TAB_ISSUES
 
   def AssertBasePermission(self, mr):
     """Check whether the user has any permission to visit this page.
@@ -83,5 +84,11 @@
       'num': num,
       'auto_submit': bool(auto_submit),
     }
-    return '/p/%s%s?%s' % (mr.project_name, urls.ISSUE_REINDEX,
-                           urllib.urlencode(query_map))
+    return '/p/%s%s?%s' % (
+        mr.project_name, urls.ISSUE_REINDEX, urllib.parse.urlencode(query_map))
+
+  # def GetIssueReindex(self, **kwargs):
+  #   return self.handler(**kwargs)
+
+  # def PostIssueReindex(self, **kwargs):
+  #   return self.handler(**kwargs)