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

Fixed some issues in dealing with multibyte characters.

Browse source
This commit is contained in:
luyijun 2014-10-22 00:37:08 +08:00
parent 0fa601f135
commit e687f935cb
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/utils/utils.py
View file

@ -64,8 +64,9 @@ def fill(text, width=78, indent=0):
""" """
if not text: if not text:
return "" return ""
text = to_unicode(text)
indent = " " * indent indent = " " * indent
return textwrap.fill(str(text), width, subsequent_indent=indent) return to_str(textwrap.fill(text, width, subsequent_indent=indent))
def crop(text, width=78, suffix="[...]"): def crop(text, width=78, suffix="[...]"):
@ -75,12 +76,15 @@ def crop(text, width=78, suffix="[...]"):
within the given width. If width is too small to fit both crop within the given width. If width is too small to fit both crop
and suffix, crop without the suffix. and suffix, crop without the suffix.
""" """
ltext = len(to_str(text))
utext = to_unicode(text)
ltext = len(utext)
if ltext <= width: if ltext <= width:
return text return text
else: else:
lsuffix = len(suffix) lsuffix = len(suffix)
return text[:width] if lsuffix >= width else "%s%s" % (text[:width - lsuffix], suffix) utext = utext[:width] if lsuffix >= width else "%s%s" % (utext[:width - lsuffix], suffix)
return to_str(utext)
def dedent(text): def dedent(text):