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

clean out unnecessary whitespace regex

Browse source
This commit is contained in:
InspectorCaracal 2022-04-03 16:43:27 -06:00 • committed by GitHub
parent f2accc353f
commit e3feffa989
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
evennia/utils/text2html.py
View file

@ -97,8 +97,7 @@ class TextToHTMLparser(object):
re_blink = re.compile("(?:%s)(.*?)(?=%s|%s)" % (blink.replace("[", r"\["), fgstop, bgstop)) re_blink = re.compile("(?:%s)(.*?)(?=%s|%s)" % (blink.replace("[", r"\["), fgstop, bgstop))
re_inverse = re.compile("(?:%s)(.*?)(?=%s|%s)" % (inverse.replace("[", r"\["), fgstop, bgstop)) re_inverse = re.compile("(?:%s)(.*?)(?=%s|%s)" % (inverse.replace("[", r"\["), fgstop, bgstop))
re_string = re.compile( re_string = re.compile(
r"(?P<htmlchars>[<&>])|(?P<tab>[\t]+)|(?P<space> +)|" r"(?P<htmlchars>[<&>])|(?P<tab>[\t]+)|(?P<lineend>\r\n|\r|\n)",
r"(?P<spacestart>^ )|(?P<lineend>\r\n|\r|\n)",
re.S | re.M | re.I, re.S | re.M | re.I,
) )
re_url = re.compile( re_url = re.compile(
@ -109,20 +108,16 @@ class TextToHTMLparser(object):
def _sub_bgfg(self, colormatch): def _sub_bgfg(self, colormatch):
# print("colormatch.groups()", colormatch.groups()) # print("colormatch.groups()", colormatch.groups())
bgcode, prespace, fgcode, text, postspace = colormatch.groups() bgcode, fgcode, text = colormatch.groups()
if not fgcode: if not fgcode:
ret = r"""<span class="%s">%s%s%s</span>""" % ( ret = r"""<span class="%s">%s%s%s</span>""" % (
self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")), self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")),
prespace and "&nbsp;" * len(prespace) or "",
postspace and "&nbsp;" * len(postspace) or "",
text, text,
) )
else: else:
ret = r"""<span class="%s"><span class="%s">%s%s%s</span></span>""" % ( ret = r"""<span class="%s"><span class="%s">%s%s%s</span></span>""" % (
self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")), self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")),
self.fg_colormap.get(fgcode, self.bg_colormap.get(fgcode, "err")), self.fg_colormap.get(fgcode, self.bg_colormap.get(fgcode, "err")),
prespace and "&nbsp;" * len(prespace) or "",
postspace and "&nbsp;" * len(postspace) or "",
text, text,
) )
return ret return ret
@ -316,11 +311,7 @@ class TextToHTMLparser(object):
elif cdict["lineend"]: elif cdict["lineend"]:
return "<br>" return "<br>"
elif cdict["tab"]: elif cdict["tab"]:
text = cdict["tab"].replace("\t", " " + "&nbsp;" * (self.tabstop - 1)) text = cdict["tab"].replace("\t", " " * (self.tabstop))
return text
elif cdict["space"] or cdict["spacestart"]:
text = cdict["space"]
text = " " if len(text) == 1 else " " + text[1:].replace(" ", "&nbsp;")
return text return text
return None return None