From 01c36089c982cc9522271666770f34853fdfafa5 Mon Sep 17 00:00:00 2001 From: jordan Date: Tue, 11 Oct 2011 21:29:38 +0000 Subject: [PATCH] resolves the issue with the email link markdown processing git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1187 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/markdownext/mdx_auto_linker.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/forum/markdownext/mdx_auto_linker.py b/forum/markdownext/mdx_auto_linker.py index e8cb5b6..c1ec9aa 100644 --- a/forum/markdownext/mdx_auto_linker.py +++ b/forum/markdownext/mdx_auto_linker.py @@ -34,6 +34,8 @@ AUTO_LINK_RE = re.compile(r""" """, re.X | re.I) +EMAIL_LINK_REPLACE_RE = re.compile("(?<= href=\")[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})(?=\")") + def is_ip(addr): try: socket.inet_aton(addr) @@ -45,7 +47,7 @@ def replacer(m): ws = m.group('ws') - if ws and ws[0] in ("'", '"'): + if ws and ws[0] in ("'", '"', "@"): return m.group(0) elif not ws: @@ -62,7 +64,7 @@ def replacer(m): if not protocol: domain_chunks = domain.split('.') - if not ((len(domain_chunks) == 1 and domain_chunks[0].lower() == 'localhost') or (domain_chunks[-1].lower() in TLDS)): + if not (len(domain_chunks) == 1 and domain_chunks[0].lower() == 'localhost') or (domain_chunks[-1].lower() in TLDS): return m.group(0) if (not protocol) and is_ip(domain): @@ -92,7 +94,10 @@ def replacer(m): class AutoLinker(markdown.postprocessors.Postprocessor): def run(self, text): - return AUTO_LINK_RE.sub(replacer, text) + text = AUTO_LINK_RE.sub(replacer, text) + text = EMAIL_LINK_REPLACE_RE.sub(lambda m: "mailto:%s" % m.group(0), text) + + return text class AutoLinkerExtension(markdown.Extension): -- 2.45.1