diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-14 14:16:49 -0400 |
| commit | 92db1b884bf34339a4536a20123c45b01c9c49ce (patch) | |
| tree | 22be0de3d0496212d26015c3b30423da9338aa5c /cloudinit/cs_utils.py | |
| parent | 91ccf1b55b5b79694449446b029dd7c4570517a5 (diff) | |
| parent | 72f826bff694b612d54b177635ca7e0dc83aed2f (diff) | |
| download | vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.tar.gz vyos-cloud-init-92db1b884bf34339a4536a20123c45b01c9c49ce.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/cs_utils.py')
| -rw-r--r-- | cloudinit/cs_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/cs_utils.py b/cloudinit/cs_utils.py index dcf56431..83ac1a0e 100644 --- a/cloudinit/cs_utils.py +++ b/cloudinit/cs_utils.py @@ -83,8 +83,8 @@ class CepkoResult(object): connection = serial.Serial(port=SERIAL_PORT, timeout=READ_TIMEOUT, writeTimeout=WRITE_TIMEOUT) - connection.write(self.request) - return connection.readline().strip('\x04\n') + connection.write(self.request.encode('ascii')) + return connection.readline().strip(b'\x04\n').decode('ascii') def _marshal(self, raw_result): try: |