1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #1349 from cgundogan/fix_pyterm_python_version

pyterm: made python compatible with python2 and python3
This commit is contained in:
Ludwig Ortmann 2014-06-27 21:04:29 +02:00
commit 4859a7195a

View File

@ -58,10 +58,10 @@ class SerCmd(cmd.Cmd):
def default(self, line):
for tok in line.split(';'):
tok = self.get_alias(tok)
self.ser.write(tok.strip() + "\n")
self.ser.write((tok.strip() + "\n").encode("utf-8"))
def do_help(self, line):
self.ser.write("help\n")
self.ser.write("help\n".encode("utf-8"))
def complete_date(self, text, line, begidx, endidm):
date = time.strftime("%Y-%m-%d %H:%M:%S")
@ -130,7 +130,7 @@ class SerCmd(cmd.Cmd):
def reader(ser, logger):
output = ""
while (1):
c = ser.read(1)
c = ser.read(1).decode("utf-8")
if c == '\n' or c == '\r':
logger.info(output)
output = ""