mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
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:
@@ -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'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user