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

evtable and evform supports ansi, with some limitations due to wrap not being supported by ANSIString at this point.

Browse source
This commit is contained in:
Griatch 2014-03-09 19:40:46 +01:00
parent 1886d455da
commit 021dca4ba7
3 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/ansi.py
View file

@ -15,7 +15,7 @@ user.
"""
import re
from src.utils import utils
from src.utils.utils import to_str
from src.utils.utils import to_str, to_unicode
# ANSI definitions
@ -468,7 +468,7 @@ class ANSIString(unicode):
decoded = kwargs.get('decoded', False) or hasattr(string, '_raw_string')
if not decoded:
# Completely new ANSI String
clean_string = unicode(parser.parse_ansi(string, strip_ansi=True))
clean_string = to_unicode(parser.parse_ansi(string, strip_ansi=True))
string = parser.parse_ansi(string)
elif hasattr(string, '_clean_string'):
# It's already an ANSIString
@ -483,7 +483,7 @@ class ANSIString(unicode):
else:
# Do this to prevent recursive ANSIStrings.
string = unicode(string)
ansi_string = super(ANSIString, cls).__new__(ANSIString, clean_string)
ansi_string = super(ANSIString, cls).__new__(ANSIString, to_str(clean_string), "utf-8")
ansi_string._raw_string = string
ansi_string._clean_string = clean_string
return ansi_string