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

Remove to_unicode.

Browse source
This commit is contained in:
Ryan Stein 2017-11-03 12:36:45 -04:00
parent 7d524ac328
commit 6f91e1e546
15 changed files with 23 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/evform.py
View file

@ -140,7 +140,7 @@ from builtins import object, range
import re
import copy
from evennia.utils.evtable import EvCell, EvTable
from evennia.utils.utils import all_from_module, to_str, to_unicode, is_iter
from evennia.utils.utils import all_from_module, to_str, is_iter
from evennia.utils.ansi import ANSIString
# non-valid form-identifying characters (which can thus be
@ -164,7 +164,7 @@ def _to_ansi(obj, regexable=False):
elif is_iter(obj):
return [_to_ansi(o) for o in obj]
else:
return ANSIString(to_unicode(obj), regexable=regexable)
return ANSIString(obj, regexable=regexable)
class EvForm(object):
@ -407,7 +407,7 @@ class EvForm(object):
self.tablechar = tablechar[0] if len(tablechar) > 1 else tablechar
# split into a list of list of lines. Form can be indexed with form[iy][ix]
self.raw_form = _to_ansi(to_unicode(datadict.get("FORM", "")).split("\n"))
self.raw_form = _to_ansi(datadict.get("FORM", "").split("\n"))
# strip first line
self.raw_form = self.raw_form[1:] if self.raw_form else self.raw_form