summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorStanislav Laznicka <slaznick@redhat.com>2017-08-28 10:52:15 +0200
committerStanislav Laznicka <slaznick@redhat.com>2017-08-30 12:44:46 +0200
commite09b6c260288b955c1f7d63209ff6b932f363ad1 (patch)
tree1b0e7efc9c81fecf858aee255e3dba367f68f49f /ipalib
parent947ac4bc1f6f4016cf5baf2ecb4577e893bc3948 (diff)
downloadfreeipa-e09b6c260288b955c1f7d63209ff6b932f363ad1.tar.gz
freeipa-e09b6c260288b955c1f7d63209ff6b932f363ad1.tar.xz
freeipa-e09b6c260288b955c1f7d63209ff6b932f363ad1.zip
rpc: don't encode bytes
bytes.encode() appeared in rpc.py by a mistake, should have been bytes.decode() https://pagure.io/freeipa/issue/4985 Reviewed-By: Felipe Volpone <fbarreto@redhat.com>
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/rpc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index ffa2b92f9..4b81e8997 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -195,7 +195,7 @@ def xml_wrap(value, version):
if isinstance(value, crypto_x509.Certificate):
return base64.b64encode(
- value.public_bytes(x509_Encoding.DER)).encode('ascii')
+ value.public_bytes(x509_Encoding.DER)).decode('ascii')
assert type(value) in (unicode, float, bool, type(None)) + six.integer_types
return value