summaryrefslogtreecommitdiffstats
path: root/install/certmonger
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-09-11 13:43:28 +0200
committerJan Cholasta <jcholast@redhat.com>2015-09-17 11:08:43 +0200
commit23507e6124041ed17f39db211e802495e37520e7 (patch)
tree8cf010848183a977fde0d5cdcd653556d215cd62 /install/certmonger
parent1550b5ab50966387bac19f46b34a2107010d08d4 (diff)
downloadfreeipa-23507e6124041ed17f39db211e802495e37520e7.tar.gz
freeipa-23507e6124041ed17f39db211e802495e37520e7.tar.xz
freeipa-23507e6124041ed17f39db211e802495e37520e7.zip
Alias "unicode" to "str" under Python 3
The six way of doing this is to replace all occurences of "unicode" with "six.text_type". However, "unicode" is non-ambiguous and (arguably) easier to read. Also, using it makes the patches smaller, which should help with backporting. Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'install/certmonger')
-rwxr-xr-xinstall/certmonger/dogtag-ipa-ca-renew-agent-submit6
1 files changed, 6 insertions, 0 deletions
diff --git a/install/certmonger/dogtag-ipa-ca-renew-agent-submit b/install/certmonger/dogtag-ipa-ca-renew-agent-submit
index 9f65b0515..44993b038 100755
--- a/install/certmonger/dogtag-ipa-ca-renew-agent-submit
+++ b/install/certmonger/dogtag-ipa-ca-renew-agent-submit
@@ -35,6 +35,8 @@ import base64
import contextlib
import json
+import six
+
from ipapython import ipautil
from ipapython.dn import DN
from ipalib import api, errors, pkcs10, x509
@@ -56,6 +58,10 @@ UNCONFIGURED = 4
WAIT_WITH_DELAY = 5
OPERATION_NOT_SUPPORTED_BY_HELPER = 6
+if six.PY3:
+ unicode = str
+
+
@contextlib.contextmanager
def ldap_connect():
conn = None