projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recast to unicode when normalizing on Python 2.x
[mudpy.git]
/
lib
/
mudpy
/
misc.py
diff --git
a/lib/mudpy/misc.py
b/lib/mudpy/misc.py
index
2fe8e6f
..
d8c863a
100644
(file)
--- a/
lib/mudpy/misc.py
+++ b/
lib/mudpy/misc.py
@@
-800,12
+800,12
@@
class User:
# and the ansi escape to return to normal text
if not just_prompt and prepend_padding:
if not self.output_queue \
# and the ansi escape to return to normal text
if not just_prompt and prepend_padding:
if not self.output_queue \
- or not self.output_queue[-1].endswith("\r\n"):
+ or not self.output_queue[-1].endswith(
b
"\r\n"):
output = "$(eol)" + output
elif not self.output_queue[-1].endswith(
output = "$(eol)" + output
elif not self.output_queue[-1].endswith(
- "\r\n\x1b[0m\r\n"
+
b
"\r\n\x1b[0m\r\n"
) and not self.output_queue[-1].endswith(
) and not self.output_queue[-1].endswith(
- "\r\n\r\n"
+
b
"\r\n\r\n"
):
output = "$(eol)" + output
output += eol + chr(27) + "[0m"
):
output = "$(eol)" + output
output += eol + chr(27) + "[0m"
@@
-1202,7
+1202,11
@@
def wrap_ansi_text(text, width):
escape = False
# normalize any potentially composited unicode before we count it
escape = False
# normalize any potentially composited unicode before we count it
- text = unicodedata.normalize("NFKC", text)
+ # TODO: remove this check after the switch to py3k
+ try:
+ text = unicodedata.normalize("NFKC", text)
+ except TypeError:
+ text = unicodedata.normalize("NFKC", unicode(text))
# iterate over each character from the begining of the text
for each_character in text:
# iterate over each character from the begining of the text
for each_character in text: