Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed regexp used in text2html's convert_urls function and moved it to the block of other parsed regex in the module

Browse source
This commit is contained in:
Dan Feeney 2015-11-08 18:12:29 -06:00 • committed by Griatch
parent b9bdeb3e9c
commit db218f7293
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/text2html.py
View file

@ -81,6 +81,7 @@ class TextToHTMLparser(object):
re_uline = re.compile("(?:%s)(.*?)(?=%s)" % (ANSI_UNDERLINE.replace("[", r"\["), fgstop)) re_uline = re.compile("(?:%s)(.*?)(?=%s)" % (ANSI_UNDERLINE.replace("[", r"\["), fgstop))
re_string = re.compile(r'(?P<htmlchars>[<&>])|(?P<space> [ \t]+)|(?P<lineend>\r\n|\r|\n)', re.S|re.M|re.I) re_string = re.compile(r'(?P<htmlchars>[<&>])|(?P<space> [ \t]+)|(?P<lineend>\r\n|\r|\n)', re.S|re.M|re.I)
re_link = re.compile(r'\{lc(.*?)\{lt(.*?)\{le', re.DOTALL) re_link = re.compile(r'\{lc(.*?)\{lt(.*?)\{le', re.DOTALL)
re_url = re.compile(r'((ftp|www|https|http)\W+[^"\',;$*^\\()[\]{}<>\s]+)')
def re_color(self, text): def re_color(self, text):
""" """
@ -181,10 +182,9 @@ class TextToHTMLparser(object):
text (str): Processed text. text (str): Processed text.
""" """
regexp = r"((ftp|www|http)(\W+\S+[^).,:;?\]\}(\<span\>) \r\n$\"\']+))"
# -> added target to output prevent the web browser from attempting to # -> added target to output prevent the web browser from attempting to
# change pages (and losing our webclient session). # change pages (and losing our webclient session).
return re.sub(regexp, r'<a href="\1" target="_blank">\1</a>', text) return re_url.sub(r'<a href="\1" target="_blank">\1</a>', text)
def convert_links(self, text): def convert_links(self, text):
""" """