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 /ipatests/test_xmlrpc | |
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 'ipatests/test_xmlrpc')
-rw-r--r-- | ipatests/test_xmlrpc/test_automount_plugin.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_cert_plugin.py | 4 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_dns_realmdomains_integration.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_idviews_plugin.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_radiusproxy_plugin.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_range_plugin.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_stageuser_plugin.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_sudorule_plugin.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/test_trust_plugin.py | 5 | ||||
-rw-r--r-- | ipatests/test_xmlrpc/testcert.py | 5 |
10 files changed, 48 insertions, 0 deletions
diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py index 952b29eec..dcc79c83c 100644 --- a/ipatests/test_xmlrpc/test_automount_plugin.py +++ b/ipatests/test_xmlrpc/test_automount_plugin.py @@ -29,12 +29,16 @@ import shutil from ipalib import api from ipalib import errors from ipapython.dn import DN +import six from nose.tools import raises, assert_raises # pylint: disable=E0611 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal from ipaplatform.paths import paths from ipatests.util import assert_deepequal +if six.PY3: + unicode = str + class MockTextui(list): """Collects output lines""" diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py index 6c364763a..a593db7f9 100644 --- a/ipatests/test_xmlrpc/test_cert_plugin.py +++ b/ipatests/test_xmlrpc/test_cert_plugin.py @@ -31,11 +31,15 @@ from ipalib import errors from ipalib import x509 import tempfile from ipapython import ipautil +import six import nose import base64 from ipaplatform.paths import paths from ipapython.dn import DN +if six.PY3: + unicode = str + # So we can save the cert from issuance and compare it later cert = None newcert = None diff --git a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py index a8c224eec..76d4a600b 100644 --- a/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py +++ b/ipatests/test_xmlrpc/test_dns_realmdomains_integration.py @@ -22,6 +22,8 @@ Test integration of DNS and realmdomains. 2. realmdomains_mod should add a _kerberos TXT record in the DNS zone. """ +import six + from ipalib import api, errors from ipalib.util import normalize_zone from ipapython.dn import DN @@ -29,6 +31,9 @@ from ipapython.dnsutil import DNSName from ipatests.test_xmlrpc import objectclasses from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_digits +if six.PY3: + unicode = str + cn = u'Realm Domains' dn = DN(('cn', cn), ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn) diff --git a/ipatests/test_xmlrpc/test_idviews_plugin.py b/ipatests/test_xmlrpc/test_idviews_plugin.py index 2823082b2..f1a46978b 100644 --- a/ipatests/test_xmlrpc/test_idviews_plugin.py +++ b/ipatests/test_xmlrpc/test_idviews_plugin.py @@ -23,6 +23,8 @@ Test the `ipalib.plugins.idviews` module. import re +import six + from ipalib import api, errors from ipatests.test_xmlrpc import objectclasses from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, uuid_re, add_oc, @@ -32,6 +34,9 @@ from ipatests.test_xmlrpc.test_group_plugin import get_group_dn from ipatests.util import Fuzzy from ipapython.dn import DN +if six.PY3: + unicode = str + idview1 = u'idview1' idview2 = u'idview2' diff --git a/ipatests/test_xmlrpc/test_radiusproxy_plugin.py b/ipatests/test_xmlrpc/test_radiusproxy_plugin.py index beb0b8c38..076712777 100644 --- a/ipatests/test_xmlrpc/test_radiusproxy_plugin.py +++ b/ipatests/test_xmlrpc/test_radiusproxy_plugin.py @@ -18,12 +18,17 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six + from ipalib import errors, api, _ from ipapython.dn import DN from ipatests.test_xmlrpc.xmlrpc_test import Declarative from ipatests.test_xmlrpc.test_user_plugin import get_user_result from ipatests.test_xmlrpc import objectclasses +if six.PY3: + unicode = str + radius1 = u'testradius' radius1_fqdn = u'testradius.test' radius1_dn = DN(('cn=testradius'), ('cn=radiusproxy'), api.env.basedn) diff --git a/ipatests/test_xmlrpc/test_range_plugin.py b/ipatests/test_xmlrpc/test_range_plugin.py index 143da96fd..29af35306 100644 --- a/ipatests/test_xmlrpc/test_range_plugin.py +++ b/ipatests/test_xmlrpc/test_range_plugin.py @@ -21,6 +21,8 @@ Test the `ipalib/plugins/idrange.py` module, and XML-RPC in general. """ +import six + from ipalib import api, errors from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid from ipatests.test_xmlrpc import objectclasses @@ -28,6 +30,9 @@ from ipatests.util import MockLDAP from ipapython.dn import DN from ipatests.test_xmlrpc.test_user_plugin import get_user_result +if six.PY3: + unicode = str + # Determine the test shift used id_shift = 0 diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py index 515191a45..b09ef6e84 100644 --- a/ipatests/test_xmlrpc/test_stageuser_plugin.py +++ b/ipatests/test_xmlrpc/test_stageuser_plugin.py @@ -13,6 +13,8 @@ import re import functools import pytest +import six + from ipalib import api, errors from ipatests.test_xmlrpc.ldaptracker import Tracker @@ -27,6 +29,9 @@ from ipapython.dn import DN from ipatests.test_xmlrpc.test_user_plugin import UserTracker, get_user_dn from ipatests.test_xmlrpc.test_group_plugin import GroupTracker +if six.PY3: + unicode = str + validuser1 = u'tuser1' validuser2 = u'tuser2' diff --git a/ipatests/test_xmlrpc/test_sudorule_plugin.py b/ipatests/test_xmlrpc/test_sudorule_plugin.py index cef0f4518..7d8735c49 100644 --- a/ipatests/test_xmlrpc/test_sudorule_plugin.py +++ b/ipatests/test_xmlrpc/test_sudorule_plugin.py @@ -22,11 +22,16 @@ Test the `ipalib/plugins/sudorule.py` module. """ from nose.tools import raises, assert_raises # pylint: disable=E0611 +import six from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal from ipalib import api from ipalib import errors +if six.PY3: + unicode = str + + class test_sudorule(XMLRPC_test): """ Test the `sudorule` plugin. diff --git a/ipatests/test_xmlrpc/test_trust_plugin.py b/ipatests/test_xmlrpc/test_trust_plugin.py index 5f2de5906..b5f53a78d 100644 --- a/ipatests/test_xmlrpc/test_trust_plugin.py +++ b/ipatests/test_xmlrpc/test_trust_plugin.py @@ -21,6 +21,8 @@ Test the `ipalib/plugins/trust.py` module. """ import nose +import six + from ipalib import api, errors from ipapython.dn import DN from ipatests.test_xmlrpc import objectclasses @@ -28,6 +30,9 @@ from ipatests.test_xmlrpc.xmlrpc_test import ( Declarative, fuzzy_guid, fuzzy_domain_sid, fuzzy_string, fuzzy_uuid, fuzzy_digits) +if six.PY3: + unicode = str + trustconfig_ad_config = DN(('cn', api.env.domain), api.env.container_cifsdomains, api.env.basedn) diff --git a/ipatests/test_xmlrpc/testcert.py b/ipatests/test_xmlrpc/testcert.py index b9a01118d..620879205 100644 --- a/ipatests/test_xmlrpc/testcert.py +++ b/ipatests/test_xmlrpc/testcert.py @@ -28,12 +28,17 @@ once per test run. import os import tempfile import shutil +import six + from ipalib import api, x509 from ipaserver.plugins import rabase from ipapython import ipautil from ipaplatform.paths import paths from ipapython.dn import DN +if six.PY3: + unicode = str + def get_testcert(subject, principal): """Get the certificate, creating it if it doesn't exist""" |