From 6f8d90d97a5f3751252f2ab99f13a5d012247f22 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Thu, 27 Jul 2017 15:37:17 +0200 Subject: [PATCH] client: make ipa-client-install py3 compatible This commit enables ipa-client-install to be installable in Python 3 and makes it run in Python 3 by default. https://pagure.io/freeipa/issue/4985 Reviewed-By: Martin Basti Reviewed-By: Felipe Volpone --- ipalib/x509.py | 2 +- ipaplatform/redhat/tasks.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ipalib/x509.py b/ipalib/x509.py index 7877df328..857245aa3 100644 --- a/ipalib/x509.py +++ b/ipalib/x509.py @@ -61,7 +61,7 @@ PEM = 0 DER = 1 PEM_REGEX = re.compile( - r'-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----', + b'-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----', re.DOTALL) EKU_SERVER_AUTH = '1.3.6.1.5.5.7.3.1' diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index cc52c6c5f..d98f8c169 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -298,7 +298,8 @@ class RedHatTaskNamespace(BaseTaskNamespace): obj += "trusted: true\n" elif trusted is False: obj += "x-distrusted: true\n" - obj += "{pem}\n\n".format(pem=cert.public_bytes(x509.Encoding.PEM)) + obj += "{pem}\n\n".format( + pem=cert.public_bytes(x509.Encoding.PEM).decode('ascii')) f.write(obj) if ext_key_usage is not None and public_key_info not in has_eku: