--- a/mercurial/minirst.py	Sat Oct 14 02:57:26 2017 -0400
+++ b/mercurial/minirst.py	Thu Oct 05 14:16:20 2017 -0400
@@ -20,13 +20,13 @@
 
 from __future__ import absolute_import
 
-import cgi
 import re
 
 from .i18n import _
 from . import (
     encoding,
     pycompat,
+    url,
     util,
 )
 
@@ -552,7 +552,7 @@
     listnest = []
 
     def escape(s):
-        return cgi.escape(s, True)
+        return url.escape(s, True)
 
     def openlist(start, level):
         if not listnest or listnest[-1][0] != start: