paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugdown: Remove trailing punctuation from automatic links

Browse Source 
And allow parentheses etc. within a link, if they're not at the end.

Fixes #401.

(imported from commit 5261fce74fe381ceece2e7406776cc5bde19deb9)
This commit is contained in:
Keegan McAllister
2012-11-20 13:33:10 -05:00
parent bdf3473bac
commit fc60543432
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zephyr/lib/bugdown/__init__.py
View File

@@ -43,8 +43,14 @@ class Bugdown(markdown.Extension):
md.inlinePatterns.add('gravatar', Gravatar(r'!gravatar\((?P<email>[^)]*)\)'), '_begin')
# A link starts after whitespace and continues to the next whitespace.
link_regex = r'\b(?P<url>https?://[^\s[\](){}<>]+)'
# A link starts at a word boundary, and ends at space or end-of-input.
# But any trailing punctuation (other than /) is not included.
# We accomplish this with a non-greedy match followed by a greedy
# lookahead assertion.
#
# markdown.inlinepatterns.Pattern compiles this with re.UNICODE, which
# is important because we're using \w.
link_regex = r'\b(?P<url>https?://[^\s]+?)(?=[^\w/]*(\s|\Z))'
md.inlinePatterns.add('autolink', AutoLink(link_regex), '>link')
# We need to re-initialize the markdown engine every 30 messages