summaryrefslogtreecommitdiffstats
path: root/ipapython/ipautil.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipapython/ipautil.py')
-rw-r--r--ipapython/ipautil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 7949bdf05..91a0eb215 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -464,7 +464,7 @@ def run(args, stdin=None, raiseonerr=True, nolog=(), env=None,
if six.PY2:
output = stdout
else:
- output = stdout.encode(encoding)
+ output = stdout.decode(encoding)
else:
output = None
@@ -472,7 +472,7 @@ def run(args, stdin=None, raiseonerr=True, nolog=(), env=None,
if six.PY2:
error_output = stderr
else:
- error_output = stderr.encode(encoding)
+ error_output = stderr.decode(encoding)
else:
error_output = None