diff options
author | Petr Viktorin <pviktori@redhat.com> | 2016-01-05 13:54:43 +0100 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-01-20 11:59:21 +0100 |
commit | b2436560dfb4f2d45d3bf4bdfe1b2a05ff98ee38 (patch) | |
tree | 4c643c0a04f5fa51965a0ed56d67f70ad1a20062 | |
parent | 462f4a5161185e74432cfe492ab959cc15b12711 (diff) | |
download | freeipa-b2436560dfb4f2d45d3bf4bdfe1b2a05ff98ee38.tar.gz freeipa-b2436560dfb4f2d45d3bf4bdfe1b2a05ff98ee38.tar.xz freeipa-b2436560dfb4f2d45d3bf4bdfe1b2a05ff98ee38.zip |
Alias "unicode" to "str" under Python 3
Follow-up to commit 23507e6124041ed17f39db211e802495e37520e7
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.
https://fedorahosted.org/freeipa/ticket/5623
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r-- | ipaserver/install/server/common.py | 5 | ||||
-rw-r--r-- | ipaserver/install/server/replicainstall.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_caacl_profile_enforcement.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_certprofile_plugin.py | 3 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/tracker/certprofile_plugin.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/tracker/user_plugin.py | 5 |
6 files changed, 27 insertions, 0 deletions
diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index c2d69064d..bd1035172 100644 --- a/ipaserver/install/server/common.py +++ b/ipaserver/install/server/common.py @@ -7,6 +7,8 @@ from __future__ import print_function import os import sys +import six + from ipapython.dn import DN from ipapython.install import common, core from ipapython.install.core import Knob @@ -14,6 +16,9 @@ from ipalib.util import validate_domain_name from ipaserver.install import bindinstance from ipapython.ipautil import check_zone_overlap +if six.PY3: + unicode = str + VALID_SUBJECT_ATTRS = ['st', 'o', 'ou', 'dnqualifier', 'c', 'serialnumber', 'l', 'title', 'sn', 'givenname', 'initials', 'generationqualifier', 'dc', 'mail', diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 7edee88e1..41d14f580 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -15,6 +15,8 @@ import socket import sys import tempfile +import six + from ipapython import ipaldap, ipautil, sysrestore from ipapython.dn import DN from ipapython.install.common import step @@ -40,6 +42,9 @@ from binascii import hexlify from .common import BaseServer +if six.PY3: + unicode = str + DIRMAN_DN = DN(('cn', 'directory manager')) diff --git a/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py b/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py index 9de257a26..dca4151d6 100644 --- a/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py +++ b/ipatests/test_xmlrpc/test_caacl_profile_enforcement.py @@ -7,6 +7,8 @@ import os import pytest import tempfile +import six + from ipalib import api, errors from ipatests.util import ( prepare_config, unlock_principal_password, change_principal) @@ -16,6 +18,9 @@ from ipatests.test_xmlrpc.tracker.caacl_plugin import CAACLTracker from ipapython.ipautil import run +if six.PY3: + unicode = str + BASE_DIR = os.path.dirname(__file__) SMIME_PROFILE_TEMPLATE = os.path.join(BASE_DIR, 'data/smime.cfg.tmpl') diff --git a/ipatests/test_xmlrpc/test_certprofile_plugin.py b/ipatests/test_xmlrpc/test_certprofile_plugin.py index 66a72de3e..e8459772d 100644 --- a/ipatests/test_xmlrpc/test_certprofile_plugin.py +++ b/ipatests/test_xmlrpc/test_certprofile_plugin.py @@ -10,12 +10,15 @@ Test the `ipalib.plugins.certprofile` module. import os import pytest +import six from ipalib import api, errors from ipatests.util import prepare_config from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, raises_exact from ipatests.test_xmlrpc.tracker.certprofile_plugin import CertprofileTracker +if six.PY3: + unicode = str IPA_CERT_SUBJ_BASE = ( api.Command.config_show() diff --git a/ipatests/test_xmlrpc/tracker/certprofile_plugin.py b/ipatests/test_xmlrpc/tracker/certprofile_plugin.py index eeb27eb14..21c96c5eb 100644 --- a/ipatests/test_xmlrpc/tracker/certprofile_plugin.py +++ b/ipatests/test_xmlrpc/tracker/certprofile_plugin.py @@ -5,12 +5,16 @@ import os +import six from ipapython.dn import DN from ipatests.test_xmlrpc.tracker.base import Tracker from ipatests.test_xmlrpc import objectclasses from ipatests.util import assert_deepequal +if six.PY3: + unicode = str + class CertprofileTracker(Tracker): """Tracker class for certprofile plugin. diff --git a/ipatests/test_xmlrpc/tracker/user_plugin.py b/ipatests/test_xmlrpc/tracker/user_plugin.py index bcae2ec78..2e042c60e 100644 --- a/ipatests/test_xmlrpc/tracker/user_plugin.py +++ b/ipatests/test_xmlrpc/tracker/user_plugin.py @@ -5,12 +5,17 @@ from ipalib import api, errors from ipapython.dn import DN +import six + from ipatests.util import assert_deepequal, get_group_dn, get_user_dn from ipatests.test_xmlrpc import objectclasses from ipatests.test_xmlrpc.xmlrpc_test import ( fuzzy_digits, fuzzy_uuid, raises_exact) from ipatests.test_xmlrpc.tracker.base import Tracker +if six.PY3: + unicode = str + class UserTracker(Tracker): """ Class for host plugin like tests """ |