cloud-init

Merge lp:~oddbloke/cloud-init/lp1475215 into lp:~cloud-init-dev/cloud-init/trunk

  1. lp1475215
  2. Merge into trunk
Proposed by Dan Watkins
Status: Merged
Merged at revision: 1120
Proposed branch: lp:~oddbloke/cloud-init/lp1475215
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
cloudinit/cs_utils.py (+2/-2)
To merge this branch: bzr merge lp:~oddbloke/cloud-init/lp1475215
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+264967@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
83 connection = serial.Serial(port=SERIAL_PORT,83 connection = serial.Serial(port=SERIAL_PORT,
84 timeout=READ_TIMEOUT,84 timeout=READ_TIMEOUT,
85 writeTimeout=WRITE_TIMEOUT)85 writeTimeout=WRITE_TIMEOUT)
86 connection.write(self.request)86 connection.write(self.request.encode('ascii'))
87 return connection.readline().strip('\x04\n')87 return connection.readline().strip(b'\x04\n').decode('ascii')
8888
89 def _marshal(self, raw_result):89 def _marshal(self, raw_result):
90 try:90 try: