未验证 提交 1a031b0c 编写于 作者: C Cleber Rosa

Merge remote-tracking branch 'hsmj1412/py3fix1'

Signed-off-by: NCleber Rosa <crosa@redhat.com>
......@@ -295,7 +295,7 @@ class CmdResult(object):
@property
def stdout_text(self):
if type(self.stdout) in string_types:
if isinstance(self.stdout, string_types):
return self.stdout
if hasattr(self.stdout, 'decode'):
return self.stdout.decode(self.encoding)
......@@ -303,7 +303,7 @@ class CmdResult(object):
@property
def stderr_text(self):
if type(self.stderr) in string_types:
if isinstance(self.stderr, string_types):
return self.stderr
if hasattr(self.stderr, 'decode'):
return self.stderr.decode(self.encoding)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册