From 52691271afe10730010f43a175149084a30a9c6d Mon Sep 17 00:00:00 2001 From: tititestor Date: Fri, 30 Dec 2022 13:03:42 +0100 Subject: [PATCH 1/3] Change escape methode by replace, for tfs --- pytest_nunit/attrs2xml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_nunit/attrs2xml.py b/pytest_nunit/attrs2xml.py index 692c585..c9ad346 100644 --- a/pytest_nunit/attrs2xml.py +++ b/pytest_nunit/attrs2xml.py @@ -6,7 +6,7 @@ class CdataComment(ET.Element): def __init__(self, text): super(CdataComment, self).__init__("CDATA!") - self.text = escape(text, {"\x1b": ""}) + self.text = text.replace("\x1b","") ET._original_serialize_xml = ET._serialize_xml From 541272e208461f608af82a5399a5380a288e80e4 Mon Sep 17 00:00:00 2001 From: tititestor Date: Wed, 4 Jan 2023 12:24:10 +0100 Subject: [PATCH 2/3] Use regex to remove escape code colors --- pytest_nunit/attrs2xml.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pytest_nunit/attrs2xml.py b/pytest_nunit/attrs2xml.py index c9ad346..337086f 100644 --- a/pytest_nunit/attrs2xml.py +++ b/pytest_nunit/attrs2xml.py @@ -1,12 +1,13 @@ import enum +import re import xml.etree.ElementTree as ET -from xml.sax.saxutils import escape class CdataComment(ET.Element): def __init__(self, text): super(CdataComment, self).__init__("CDATA!") - self.text = text.replace("\x1b","") + pattern = "\x1b\[[0-9;]*m" + self.text = re.sub(pattern,'',text) ET._original_serialize_xml = ET._serialize_xml From e060ead76913a6b2ff541619beb5744ebc19ff08 Mon Sep 17 00:00:00 2001 From: tititestor Date: Wed, 4 Jan 2023 14:16:34 +0100 Subject: [PATCH 3/3] finalize using rexex to remove escape code colors --- pytest_nunit/attrs2xml.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pytest_nunit/attrs2xml.py b/pytest_nunit/attrs2xml.py index 337086f..e00b014 100644 --- a/pytest_nunit/attrs2xml.py +++ b/pytest_nunit/attrs2xml.py @@ -6,8 +6,7 @@ class CdataComment(ET.Element): def __init__(self, text): super(CdataComment, self).__init__("CDATA!") - pattern = "\x1b\[[0-9;]*m" - self.text = re.sub(pattern,'',text) + self.text = re.sub("\x1b\[[0-9;]*m",'',text) ET._original_serialize_xml = ET._serialize_xml