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 /ipalib/plugable.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 'ipalib/plugable.py')
| -rw-r--r-- | ipalib/plugable.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipalib/plugable.py b/ipalib/plugable.py index 3f65f6736..2a608d8cb 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -36,6 +36,8 @@ import textwrap import collections import importlib +import six + from ipalib import errors from ipalib.config import Env from ipalib import text @@ -45,6 +47,9 @@ from ipalib.constants import DEFAULT_CONFIG from ipapython.ipa_log_manager import * from ipapython.version import VERSION, API_VERSION +if six.PY3: + unicode = str + # FIXME: Updated constants.TYPE_ERROR to use this clearer format from wehjit: TYPE_ERROR = '%s: need a %r; got a %r: %r' |