summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-11-10 22:35:11 +0100
committerLars Wirzenius <liw@liw.fi>2017-11-10 22:35:11 +0100
commit330104f2a8ad071a79a73320f9cdc3d457cdbaa8 (patch)
tree7dd3d7277434970ef54959c69da2229aa8d17e1a
parented1cffe3469b52041e95d0f3a450e307c7d64ba3 (diff)
downloadttystatus-330104f2a8ad071a79a73320f9cdc3d457cdbaa8.tar.gz
Fix: Python3 str/bytes confusion
-rw-r--r--ttystatus/area.py5
-rw-r--r--ttystatus/tty.py2
2 files changed, 5 insertions, 2 deletions
diff --git a/ttystatus/area.py b/ttystatus/area.py
index 370f422..2bea1c6 100644
--- a/ttystatus/area.py
+++ b/ttystatus/area.py
@@ -77,10 +77,11 @@ class AreaManager(object):
if i > 0:
parts.append(down)
parts.append(cr)
- parts.append(line[:max_chars])
+ parts.append(line[:max_chars].encode())
parts.append(erase)
- self._terminal.write(''.join(parts))
+ output = b''.join(parts)
+ self._terminal.write(output)
def clear_area(self, num_lines):
'''Clear area reserved for message needing a given number of lines.
diff --git a/ttystatus/tty.py b/ttystatus/tty.py
index 83561b6..d3df316 100644
--- a/ttystatus/tty.py
+++ b/ttystatus/tty.py
@@ -95,6 +95,8 @@ class PhysicalTerminal(object):
'''
+ if not isinstance(raw_data, bytes):
+ raw_data = raw_data.encode()
if self._terminal is not None:
try:
self._terminal.write(raw_data)