Merge "Do not log binary data during debug"

This commit is contained in:
Jenkins 2015-08-24 20:16:56 +00:00 committed by Gerrit Code Review
commit f1cdb20528

View File

@ -185,6 +185,11 @@ class Session(object):
if json:
data = self._json.encode(json)
if data:
if isinstance(data, six.binary_type):
try:
data = data.decode("ascii")
except UnicodeDecodeError:
data = "<binary_data>"
string_parts.append("-d '%s'" % data)
logger.debug(' '.join(string_parts))