diff options
| author | Radomir Dopieralski <sheep-devel@sheep.art.pl> | 2012-02-05 08:48:12 (GMT) |
|---|---|---|
| committer | Radomir Dopieralski <sheep-devel@sheep.art.pl> | 2012-02-05 08:48:12 (GMT) |
| commit | ed02d6555853fbf8e120aa7dcd750bc681d8f6b3 (patch) | |
| tree | b3536549f9e2442c94646c36baf167d98dd03f12 /hatta | |
| parent | 7c6a854378343e4fb8fee3562e389a46f86d48b0 (diff) | |
re-merge the fix for #79
Diffstat (limited to 'hatta')
| -rw-r--r-- | hatta/parser.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hatta/parser.py b/hatta/parser.py index f9b9225..1a6a635 100644 --- a/hatta/parser.py +++ b/hatta/parser.py @@ -334,12 +334,12 @@ class WikiParser(object): def _line_code(self, code_text): return u'<code>%s</code>' % werkzeug.escape(code_text) - @markup_rules(ur"""(?P<link_url>[a-zA-Z]+://\S+[^\s.,:;!?()'"=+<>-])""", 30) + @markup_rules(ur"""(?P<link_url>[a-zA-Z]+://\S+[^\s.,:;!?()'"\*/=+<>-])""", 30) def _line_free_link(self, link_url): return self._line_link(link_target=link_url) @markup_rules(ur"""(?P<mail_address>(mailto:)?""" - ur"""\S+@\S+(\.[^\s.,:;!?()'"/=+<>-]+)+)""", 90) + ur"""\S+@\S+(\.[^\s.,:;!?()'"\*/=+<>-]+)+)""" , 90) def _line_mail(self, mail_address): text = mail_address if mail_address.startswith(u'mailto:'): |