x/cloud-init
Code Issues Proposed changes

Python 3 tests pass, except for skips.

Browse Source
This commit is contained in:
Barry Warsaw 2015-01-26 16:18:57 -05:00
parent d15fd3138a
commit c86cdd766f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudinit/user_data.py
View File

@ -108,6 +108,7 @@ class UserDataProcessor(object):
ctype = None ctype = None
ctype_orig = part.get_content_type() ctype_orig = part.get_content_type()
ctype_main = part.get_content_maintype()
payload = part.get_payload(decode=True) payload = part.get_payload(decode=True)
# In Python 3, decoding the payload will ironically hand us a # In Python 3, decoding the payload will ironically hand us a
# bytes object. 'decode' means to decode according to # bytes object. 'decode' means to decode according to
@ -115,7 +116,7 @@ class UserDataProcessor(object):
# Content-Type. So, if we end up with bytes, first try to decode # Content-Type. So, if we end up with bytes, first try to decode
# to str via CT charset, and failing that, try utf-8 using # to str via CT charset, and failing that, try utf-8 using
# surrogate escapes. # surrogate escapes.
if six.PY3 and isinstance(payload, bytes): if six.PY3 and ctype_main == 'text' and isinstance(payload, bytes):
charset = part.get_charset() or 'utf-8' charset = part.get_charset() or 'utf-8'
payload = payload.decode(charset, errors='surrogateescape') payload = payload.decode(charset, errors='surrogateescape')
was_compressed = False was_compressed = False
@ -131,6 +132,7 @@ class UserDataProcessor(object):
ctype_orig = None ctype_orig = None
was_compressed = True was_compressed = True
except util.DecompressionError as e: except util.DecompressionError as e:
import pdb; pdb.set_trace()
LOG.warn("Failed decompressing payload from %s of length" LOG.warn("Failed decompressing payload from %s of length"
" %s due to: %s", ctype_orig, len(payload), e) " %s due to: %s", ctype_orig, len(payload), e)
continue continue