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

Resolves #482. ANSIString splitting and slicing more sane.

Browse source
This commit is contained in:
Kelketek Rritaa 2014-02-24 15:01:26 -06:00
parent 67f53564cb
commit d4e98a80f9
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/utils/ansi.py
View file

@ -608,7 +608,10 @@ class ANSIString(unicode):
except IndexError: except IndexError:
raise IndexError("ANSIString Index out of range") raise IndexError("ANSIString Index out of range")
# Get character codes after the index as well. # Get character codes after the index as well.
append_tail = self._get_interleving(item + 1) if self._char_indexes[-1] == self._char_indexes[item]:
append_tail = self._get_interleving(item + 1)
else:
append_tail = ''
item = self._char_indexes[item] item = self._char_indexes[item]
clean = self._raw_string[item] clean = self._raw_string[item]
@ -721,6 +724,13 @@ class ANSIString(unicode):
char_indexes = [] char_indexes = []
for start, end in list(group(flat_ranges, 2)): for start, end in list(group(flat_ranges, 2)):
char_indexes.extend(range(start, end)) char_indexes.extend(range(start, end))
# The end character will be left off if it's a normal character. Fix
# that here.
if end_index in flat_ranges:
char_indexes.append(end_index)
# And in some instances, this may also end up in the code indexes
if end_index in code_indexes:
code_indexes.pop()
return code_indexes, char_indexes return code_indexes, char_indexes
def _get_interleving(self, index): def _get_interleving(self, index):
@ -728,7 +738,10 @@ class ANSIString(unicode):
Get the code characters from the given slice end to the next Get the code characters from the given slice end to the next
character. character.
""" """
index = self._char_indexes[index - 1] try:
index = self._char_indexes[index - 1]
except IndexError:
return ''
s = '' s = ''
while True: while True:
index += 1 index += 1
@ -759,7 +772,7 @@ class ANSIString(unicode):
if next < 0: if next < 0:
break break
# Get character codes after the index as well. # Get character codes after the index as well.
res.append(self[start:next] + self._get_interleving(next)) res.append(self[start:next])
start = next + bylen start = next + bylen
maxsplit -= 1 # NB. if it's already < 0, it stays < 0 maxsplit -= 1 # NB. if it's already < 0, it stays < 0
@ -785,7 +798,7 @@ class ANSIString(unicode):
if next < 0: if next < 0:
break break
# Get character codes after the index as well. # Get character codes after the index as well.
res.append(self[next+bylen:end] + self._get_interleving(end)) res.append(self[next+bylen:end])
end = next end = next
maxsplit -= 1 # NB. if it's already < 0, it stays < 0 maxsplit -= 1 # NB. if it's already < 0, it stays < 0