summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/bindinstance.py
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 /ipaserver/install/bindinstance.py
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 'ipaserver/install/bindinstance.py')
-rw-r--r--ipaserver/install/bindinstance.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index c52b1c0d6..771f13b00 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -48,6 +48,9 @@ from ipalib.util import (validate_zonemgr_str, normalize_zonemgr,
EDNS0UnsupportedError, UnresolvableRecordError)
from ipalib.constants import CACERT
+if six.PY3:
+ unicode = str
+
NAMED_CONF = paths.NAMED_CONF
RESOLV_CONF = paths.RESOLV_CONF