Merge pull request #10263 from nicoa/escape_base_uri_in_extlinks

tk0miya · web-flow · commit 746df6145239 · 2022-03-28T00:06:22.000+09:00
escape base_uri in extlinks
diff --git a/sphinx/ext/extlinks.py b/sphinx/ext/extlinks.py
@@ -18,6 +18,7 @@
 """
 
 import re
+import sys
 import warnings
 from typing import Any, Dict, List, Tuple
 
@@ -65,7 +66,13 @@ def check_uri(self, refnode: nodes.reference) -> None:
         title = refnode.astext()
 
         for alias, (base_uri, _caption) in self.app.config.extlinks.items():
-            uri_pattern = re.compile(base_uri.replace('%s', '(?P<value>.+)'))
+            if sys.version_info < (3, 7):
+                # Replace a leading backslash because re.escape() inserts a backslash before %
+                # on python 3.6
+                uri_pattern = re.compile(re.escape(base_uri).replace('\\%s', '(?P<value>.+)'))
+            else:
+                uri_pattern = re.compile(re.escape(base_uri).replace('%s', '(?P<value>.+)'))
+
             match = uri_pattern.match(uri)
             if match and match.groupdict().get('value'):
                 # build a replacement suggestion
