diff options
| -rw-r--r-- | ipapython/ipautil.py | 4 | ||||
| -rw-r--r-- | ipapython/kernel_keyring.py | 6 | ||||
| -rw-r--r-- | ipatests/test_ipapython/test_ipautil.py | 2 |
3 files changed, 6 insertions, 6 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 diff --git a/ipapython/kernel_keyring.py b/ipapython/kernel_keyring.py index 7ba916ccb..ed4868a9d 100644 --- a/ipapython/kernel_keyring.py +++ b/ipapython/kernel_keyring.py @@ -50,7 +50,7 @@ def get_real_key(key): raiseonerr=False, capture_output=True) if result.returncode: raise ValueError('key %s not found' % key) - return result.output.rstrip() + return result.raw_output.rstrip() def get_persistent_key(key): assert isinstance(key, str) @@ -58,7 +58,7 @@ def get_persistent_key(key): raiseonerr=False, capture_output=True) if result.returncode: raise ValueError('persistent key %s not found' % key) - return result.output.rstrip() + return result.raw_output.rstrip() def is_persistent_keyring_supported(): uid = os.geteuid() @@ -93,7 +93,7 @@ def read_key(key): if result.returncode: raise ValueError('keyctl pipe failed: %s' % result.error_log) - return result.output + return result.raw_output def update_key(key, value): """ diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py index 8a437f83e..52f87c7f6 100644 --- a/ipatests/test_ipapython/test_ipautil.py +++ b/ipatests/test_ipapython/test_ipautil.py @@ -444,7 +444,7 @@ def test_run_no_capture_output(): def test_run_bytes(): result = ipautil.run(['echo', b'\x01\x02'], capture_output=True) assert result.returncode == 0 - assert result.output == b'\x01\x02\n' + assert result.raw_output == b'\x01\x02\n' def test_run_decode(): |