x
/
cloud-init
Code Issues Proposed changes

Do the append after escape.

This commit is contained in:
Joshua Harlow 2012-11-06 14:27:56 -08:00
parent ab23d601bf
commit 51c2d2f595
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloudinit/handlers/__init__.py
View File

@ -162,14 +162,14 @@ def _extract_first_or_bytes(blob, size):
def _escape_string(text):
try:
text = "'%s...'" % (text.encode("string-escape"))
return text.encode("string-escape")
except TypeError:
try:
# Unicode doesn't support string-escape...
text = "'%s...'" % (text.encode('unicode-escape'))
return text.encode('unicode-escape')
except TypeError:
# Give up...
text = "'%s...'" % (text)
pass
return text
@ -184,7 +184,7 @@ def walker_callback(pdata, ctype, filename, payload):
elif payload:
# Extract the first line or 24 bytes for displaying in the log
start = _extract_first_or_bytes(payload, 24)
details = _escape_string(start)
details = "'%s...'" % (_escape_string(start))
if ctype == NOT_MULTIPART_TYPE:
LOG.warning("Unhandled non-multipart (%s) userdata: %s",
ctype, details)