From c33ac7e2deecadeb7f34dacc4e91a3cad2c87ffd Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Thu, 16 Jul 2015 10:12:24 +0100
Subject: CloudSigma: encode/decode data before communicating over the serial
channel
---
cloudinit/cs_utils.py | 4 ++--
1 file 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:
--
cgit v1.2.3