From 8f12dd83a3b22102a15e96b045a262e51ccbeb9e Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 26 Apr 2016 21:09:45 +0200 Subject: [PATCH] Fixed an error in the MXP implementation and also removed the deprecated {-form for MXP. Resolves #966. --- evennia/server/portal/mxp.py | 4 +--- evennia/utils/ansi.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/evennia/server/portal/mxp.py b/evennia/server/portal/mxp.py index 02e80a7a90..5f10f1d5c7 100644 --- a/evennia/server/portal/mxp.py +++ b/evennia/server/portal/mxp.py @@ -16,8 +16,7 @@ http://www.gammon.com.au/mushclient/addingservermxp.htm from builtins import object import re -LINKS_SUB = re.compile(r'\{lc(.*?)\{lt(.*?)\{le', re.DOTALL) -LINKS_SUB2 = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL) +LINKS_SUB = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL) MXP = "\x5B" MXP_TEMPSECURE = "\x1B[4z" @@ -43,7 +42,6 @@ def mxp_parse(text): .replace(">", ">") text = LINKS_SUB.sub(MXP_SEND, text) - text = LINKS_SUB2.sub(MXP_SEND, text) return text class Mxp(object): diff --git a/evennia/utils/ansi.py b/evennia/utils/ansi.py index 04847ff7ef..d8f6054708 100644 --- a/evennia/utils/ansi.py +++ b/evennia/utils/ansi.py @@ -434,8 +434,7 @@ class ANSIParser(object): (r'\|\[[0-5]{3}', ""), # |[123 - background colour ] - mxp_re = r'\{lc(.*?)\{lt(.*?)\{le|' \ - r'\|lc(.*?)\|lt(.*?)\|le' + mxp_re = r'\|lc(.*?)\|lt(.*?)\|le' # prepare regex matching brightbg_sub = re.compile(r"|".join([re.escape(tup[0]) for tup in ansi_bright_bgs]), re.DOTALL)