← Back to team overview

cloud-init-dev team mailing list archive

[Merge] lp:~daniel-thewatkins/cloud-init/lp1475215 into lp:cloud-init

 

Dan Watkins has proposed merging lp:~daniel-thewatkins/cloud-init/lp1475215 into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1475215 in cloud-init: "cloudinit.cs_utils.Cepko doesn't work under Python 3"
  https://bugs.launchpad.net/cloud-init/+bug/1475215

For more details, see:
https://code.launchpad.net/~daniel-thewatkins/cloud-init/lp1475215/+merge/264967
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~daniel-thewatkins/cloud-init/lp1475215 into lp:cloud-init.
=== modified file 'cloudinit/cs_utils.py'
--- cloudinit/cs_utils.py	2014-05-30 18:46:53 +0000
+++ cloudinit/cs_utils.py	2015-07-16 09:12:57 +0000
@@ -83,8 +83,8 @@
         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:


Follow ups