[#8597] minor cleanup

Author: brondsem

Allura/allura/lib/markdown_extensions.py

@@ -309,7 +309,7 @@ def extendMarkdown(self, md):
 
 class EmojiInlinePattern(markdown.inlinepatterns.InlineProcessor):
 
-    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | None, int | None, int | None]:
+    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | str | None, int | None, int | None]:
         emoji_code = m.group(1)
         return emoji.emojize(emoji_code, language="alias"), m.start(0), m.end(0)
 
@@ -325,7 +325,7 @@ def extendMarkdown(self, md):
 
 class UserMentionInlinePattern(markdown.inlinepatterns.InlineProcessor):
 
-    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | None, int | None, int | None]:
+    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | str | None, int | None, int | None]:
         user_name = m.group(1).replace("@", "")
         user = M.User.by_username(user_name)
         result = None
@@ -429,15 +429,18 @@ def __init__(self, *args, **kwargs):
         self.macro = macro.parse(self.ext._macro_context)
         super().__init__(*args, **kwargs)
 
-    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | None, int | None, int | None]:
+    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | str | None, int | None, int | None]:
         html = self.macro(m.group(1))
         placeholder = self.md.htmlStash.store(html)
         return placeholder, m.start(0), m.end(0)
 
 
 class ForgeLinkTreeProcessor(markdown.treeprocessors.Treeprocessor):
+    '''
+    Wraps artifact links with [] and tracks those artifact links for search.find_shortlinks
 
-    '''Wraps artifact links with []'''
+    The 'alink' class itself is not currently needed for any JS/CSS but ends up in HTML anyway
+    '''
 
     def __init__(self, parent):
         self.parent = parent
@@ -544,7 +547,7 @@ def run(self, text):
 
 class AutolinkPattern(markdown.inlinepatterns.InlineProcessor):
 
-    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | None, int | None, int | None]:
+    def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | str | None, int | None, int | None]:
         old_link = m.group(1)
         result = etree.Element('a')
         result.text = old_link

ForgeWiki/forgewiki/wiki_main.py

@@ -169,10 +169,10 @@ def default_root_page_text(self):
 
 This is the default page, edit it as you see fit. To add a new page simply reference it within brackets, e.g.: [SamplePage].
 
-The wiki uses [Markdown](%s) syntax.
+The wiki uses [Markdown](/nf/markdown_syntax) syntax.
 
 [[members limit=20]]
-""" % (self.url + 'markdown_syntax/')
+"""
 
     @property
     def show_discussion(self):