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

Fixed a bug in strip_ansi that caused issues all over.

Browse source
This commit is contained in:
Griatch 2014-03-03 12:26:57 +01:00
parent ef89099319
commit 1a65d12b2c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/admin.py
View file

@ -204,7 +204,7 @@ class CmdBan(MuxCommand):
# save updated banlist # save updated banlist
banlist.append(bantup) banlist.append(bantup)
ServerConfig.objects.conf('server_bans', banlist) ServerConfig.objects.conf('server_bans', banlist)
self.caller.msg("%s-Ban {w%s{x was added." % (typ, ban)) self.caller.msg("%s-Ban {w%s{n was added." % (typ, ban))
class CmdUnban(MuxCommand): class CmdUnban(MuxCommand):

11
src/utils/ansi.py
View file

@ -205,9 +205,9 @@ class ANSIParser(object):
if strip_ansi: if strip_ansi:
# remove all ansi codes (including those manually # remove all ansi codes (including those manually
# inserted in string) # inserted in string)
return self.strip_ansi(string) return self.strip_ansi(parsed_string)
# cache and crop old cache # cache and crop old cache
_PARSE_CACHE[cachekey] = parsed_string _PARSE_CACHE[cachekey] = parsed_string
if len(_PARSE_CACHE) > _PARSE_CACHE_SIZE: if len(_PARSE_CACHE) > _PARSE_CACHE_SIZE:
_PARSE_CACHE.popitem(last=False) _PARSE_CACHE.popitem(last=False)
@ -682,6 +682,13 @@ class ANSIString(unicode):
other assumed to be what isn't in the first. other assumed to be what isn't in the first.
""" """
# These are all the indexes which hold code characters. # These are all the indexes which hold code characters.
#matches = [(match.start(), match.end())
# for match in self.parser.ansi_regex.finditer(self._raw_string)]
#code_indexes = []
# # These are all the indexes which hold code characters.
#for start, end in matches:
# code_indexes.extend(range(start, end))
code_indexes = [] code_indexes = []
for match in self.parser.ansi_regex.finditer(self._raw_string): for match in self.parser.ansi_regex.finditer(self._raw_string):
code_indexes.extend(range(match.start(), match.end())) code_indexes.extend(range(match.start(), match.end()))