Changeset 887:7540675ffe4e in hatta-dev for hatta/parser.py

Timestamp:

02/05/12 09:48:12 (3 months ago)

Author:

Radomir Dopieralski <sheep-devel@…>

Branch:

default

Message:

re-merge the fix for #79

File:

• hatta/parser.py (modified) (1 diff)

hatta/parser.py

@@ -335 +335 @@
         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