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

Merge pull request #462 from Kelketek/master

Browse source 
Flipped __radd__ arguments for ANSIString.... harder! Added __add__ Fixes Issue #460.
This commit is contained in:
Griatch 2014-01-28 05:26:14 -08:00
commit 771eb5c258
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/utils/ansi.py
View file

@ -377,11 +377,17 @@ class ANSIString(unicode):
def __len__(self): def __len__(self):
return len(self.clean_string) return len(self.clean_string)
def __add__(self, other):
if not isinstance(other, basestring):
return NotImplemented
return ANSIString(self.raw_string + getattr(
other, 'raw_string', other), decoded=True)
def __radd__(self, other): def __radd__(self, other):
if not isinstance(other, basestring): if not isinstance(other, basestring):
return NotImplemented return NotImplemented
return ANSIString(getattr( return ANSIString(getattr(
other, 'raw_string', other), decoded=True + self.raw_string) other, 'raw_string', other) + self.raw_string, decoded=True)
def __getslice__(self, i, j): def __getslice__(self, i, j):
return self.__getitem__(slice(i, j)) return self.__getitem__(slice(i, j))
@ -565,7 +571,7 @@ for func_name in [
'rfind', 'rindex']: 'rfind', 'rindex']:
setattr(ANSIString, func_name, _query_super(func_name)) setattr(ANSIString, func_name, _query_super(func_name))
for func_name in [ for func_name in [
'__mul__', '__mod__', '__add__', 'expandtabs', '__rmul__', 'join', '__mul__', '__mod__', 'expandtabs', '__rmul__', 'join',
'decode', 'replace', 'format']: 'decode', 'replace', 'format']:
setattr(ANSIString, func_name, _on_raw(func_name)) setattr(ANSIString, func_name, _on_raw(func_name))
for func_name in [ for func_name in [