From ba937457242d37fdd92cc7cfe7c489f2695d6ffb Mon Sep 17 00:00:00 2001
From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com>
Date: Sun, 3 Apr 2022 17:12:11 -0600
Subject: [PATCH] removing missed regex groups
---
evennia/utils/text2html.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py
index dcffd5ac31..be8f459c87 100644
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@@ -79,11 +79,11 @@ class TextToHTMLparser(object):
# create stop markers
fgstop = "(?:\033\[1m|\033\[22m){0,1}\033\[3[0-8].*?m|\033\[0m|$"
bgstop = "(?:\033\[1m|\033\[22m){0,1}\033\[4[0-8].*?m|\033\[0m|$"
- bgfgstop = bgstop[:-2] + r"(\s*)" + fgstop
+ bgfgstop = bgstop[:-2] + fgstop
fgstart = "((?:\033\[1m|\033\[22m){0,1}\033\[3[0-8].*?m)"
bgstart = "((?:\033\[1m|\033\[22m){0,1}\033\[4[0-8].*?m)"
- bgfgstart = bgstart + r"(\s*)" + "((?:\033\[1m|\033\[22m){0,1}\033\[[3-4][0-8].*?m){0,1}"
+ bgfgstart = bgstart + r"((?:\033\[1m|\033\[22m){0,1}\033\[[3-4][0-8].*?m){0,1}"
# extract color markers, tagging the start marker and the text marked
re_fgs = re.compile(fgstart + "(.*?)(?=" + fgstop + ")")
@@ -110,12 +110,12 @@ class TextToHTMLparser(object):
# print("colormatch.groups()", colormatch.groups())
bgcode, fgcode, text = colormatch.groups()
if not fgcode:
- ret = r"""%s%s%s""" % (
+ ret = r"""%s""" % (
self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")),
text,
)
else:
- ret = r"""%s%s%s""" % (
+ ret = r"""%s""" % (
self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")),
self.fg_colormap.get(fgcode, self.bg_colormap.get(fgcode, "err")),
text,