diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-09-11 13:43:28 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-09-17 11:08:43 +0200 |
| commit | 23507e6124041ed17f39db211e802495e37520e7 (patch) | |
| tree | 8cf010848183a977fde0d5cdcd653556d215cd62 /ipaserver/install/ipa_ldap_updater.py | |
| parent | 1550b5ab50966387bac19f46b34a2107010d08d4 (diff) | |
| download | freeipa-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/ipa_ldap_updater.py')
| -rw-r--r-- | ipaserver/install/ipa_ldap_updater.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py index 062bd5a43..90c09c48f 100644 --- a/ipaserver/install/ipa_ldap_updater.py +++ b/ipaserver/install/ipa_ldap_updater.py @@ -28,6 +28,8 @@ from __future__ import print_function import os import sys +import six + from ipalib import api from ipapython import ipautil, admintool from ipaplatform.paths import paths @@ -35,6 +37,9 @@ from ipaserver.install import installutils, dsinstance, schemaupdate from ipaserver.install.ldapupdate import LDAPUpdate, UPDATES_DIR, BadSyntax from ipaserver.install.upgradeinstance import IPAUpgrade +if six.PY3: + unicode = str + class LDAPUpdater(admintool.AdminTool): command_name = 'ipa-ldap-updater' |