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>
This commit is contained in:
Jan Cholasta
2015-09-11 13:43:28 +02:00
parent 1550b5ab50
commit 23507e6124
90 changed files with 394 additions and 0 deletions

View File

@@ -25,6 +25,8 @@ import re
from distutils import version
from textwrap import wrap
import six
from ipapython.version import API_VERSION
from ipapython.ipa_log_manager import root_logger
from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
@@ -39,6 +41,8 @@ from ipalib.errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
from ipalib import messages
from ipalib.util import json_serialize
if six.PY3:
unicode = str
RULE_FLAG = 'validation_rule'