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>

25 files changed, 119 insertions, 0 deletions

diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py
index 1a97608a4..3ad07f7da 100644
--- a/ipatests/test_cmdline/test_cli.py
+++ b/ipatests/test_cmdline/test_cli.py
@@ -4,11 +4,15 @@ import contextlib
 import StringIO
 
 import nose
+import six
 
 from ipatests import util
 from ipalib import api, errors
 from ipapython.version import API_VERSION
 
+if six.PY3:
+    unicode = str
+
 
 class TestCLIParsing(object):
     """Tests that commandlines are correctly parsed to Command keyword args
diff --git a/ipatests/test_cmdline/test_help.py b/ipatests/test_cmdline/test_help.py
index 68684a925..2c0db3288 100644
--- a/ipatests/test_cmdline/test_help.py
+++ b/ipatests/test_cmdline/test_help.py
@@ -22,10 +22,14 @@ import contextlib
 import StringIO
 
 from nose.tools import assert_raises  # pylint: disable=E0611
+import six
 
 from ipalib import api, errors
 from ipalib.plugins.user import user_add
 
+if six.PY3:
+    unicode = str
+
 
 class CLITestContext(object):
     """Context manager that replaces stdout & stderr, and catches SystemExit
diff --git a/ipatests/test_ipalib/test_base.py b/ipatests/test_ipalib/test_base.py
index 265e11858..67a82aa92 100644
--- a/ipatests/test_ipalib/test_base.py
+++ b/ipatests/test_ipalib/test_base.py
@@ -21,11 +21,16 @@
 Test the `ipalib.base` module.
 """
 
+import six
+
 from ipatests.util import ClassChecker, raises
 from ipalib.constants import NAME_REGEX, NAME_ERROR
 from ipalib.constants import TYPE_ERROR, SET_ERROR, DEL_ERROR, OVERRIDE_ERROR
 from ipalib import base
 
+if six.PY3:
+    unicode = str
+
 
 class test_ReadOnly(ClassChecker):
     """
diff --git a/ipatests/test_ipalib/test_errors.py b/ipatests/test_ipalib/test_errors.py
index 831800606..8cc9cd276 100644
--- a/ipatests/test_ipalib/test_errors.py
+++ b/ipatests/test_ipalib/test_errors.py
@@ -27,11 +27,16 @@ Test the `ipalib.errors` module.
 import re
 import inspect
 
+import six
+
 from ipatests.util import assert_equal, raises
 from ipalib import errors, text
 from ipaplatform.paths import paths
 from ipalib.constants import TYPE_ERROR
 
+if six.PY3:
+    unicode = str
+
 
 class PrivateExceptionTester(object):
     _klass = None
diff --git a/ipatests/test_ipalib/test_frontend.py b/ipatests/test_ipalib/test_frontend.py
index c74646dc1..d22718c8b 100644
--- a/ipatests/test_ipalib/test_frontend.py
+++ b/ipatests/test_ipalib/test_frontend.py
@@ -24,6 +24,8 @@ Test the `ipalib.frontend` module.
 # FIXME: Pylint errors
 # pylint: disable=no-member
 
+import six
+
 from ipatests.util import raises, read_only
 from ipatests.util import ClassChecker, create_test_api
 from ipatests.util import assert_equal
@@ -34,6 +36,10 @@ from ipalib import output, messages
 from ipalib.parameters import Str
 from ipapython.version import API_VERSION
 
+if six.PY3:
+    unicode = str
+
+
 def test_RULE_FLAG():
     assert frontend.RULE_FLAG == 'validation_rule'
 
diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py
index e837bf8ec..6b8fc1d94 100644
--- a/ipatests/test_ipalib/test_parameters.py
+++ b/ipatests/test_ipalib/test_parameters.py
@@ -43,6 +43,9 @@ from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR
 from ipalib.errors import ValidationError, ConversionError
 from ipalib import _
 
+if six.PY3:
+    unicode = str
+
 NULLS = (None, '', u'', tuple(), [])
 
 class test_DefaultFrom(ClassChecker):
diff --git a/ipatests/test_ipalib/test_rpc.py b/ipatests/test_ipalib/test_rpc.py
index 5c130bdc6..710d09832 100644
--- a/ipatests/test_ipalib/test_rpc.py
+++ b/ipatests/test_ipalib/test_rpc.py
@@ -25,6 +25,8 @@ from __future__ import print_function
 from xmlrpclib import Binary, Fault, dumps, loads
 
 import nose
+import six
+
 from ipatests.util import raises, assert_equal, PluginTester, DummyClass
 from ipatests.data import binary_bytes, utf8_bytes, unicode_str
 from ipalib.frontend import Command
@@ -32,6 +34,9 @@ from ipalib.request import context, Connection
 from ipalib import rpc, errors, api, request
 from ipapython.version import API_VERSION
 
+if six.PY3:
+    unicode = str
+
 
 std_compound = (binary_bytes, utf8_bytes, unicode_str)
 
diff --git a/ipatests/test_ipalib/test_text.py b/ipatests/test_ipalib/test_text.py
index c6ab38887..195610d27 100644
--- a/ipatests/test_ipalib/test_text.py
+++ b/ipatests/test_ipalib/test_text.py
@@ -26,8 +26,11 @@ import os
 import shutil
 import tempfile
 import re
+
 import nose
 import locale
+import six
+
 from ipatests.util import raises, assert_equal
 from ipatests.i18n import create_po, po_file_iterate
 from ipalib.request import context
@@ -35,6 +38,9 @@ from ipalib import request
 from ipalib import text
 from ipapython.ipautil import file_exists
 
+if six.PY3:
+    unicode = str
+
 singular = '%(count)d goose makes a %(dish)s'
 plural = '%(count)d geese make a %(dish)s'
 
diff --git a/ipatests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py
index 69ccbde8e..14aaeafb5 100644
--- a/ipatests/test_ipapython/test_dn.py
+++ b/ipatests/test_ipapython/test_dn.py
@@ -2,8 +2,13 @@
 
 import unittest
 
+import six
+
 from ipapython.dn import *
 
+if six.PY3:
+    unicode = str
+
 def expected_class(klass, component):
     if klass is AVA:
         if component == 'self':
diff --git a/ipatests/test_ipapython/test_ssh.py b/ipatests/test_ipapython/test_ssh.py
index 913ff8e6b..9826a34c3 100644
--- a/ipatests/test_ipapython/test_ssh.py
+++ b/ipatests/test_ipapython/test_ssh.py
@@ -21,10 +21,16 @@ Test the `ipapython/ssh.py` module.
 """
 
 import base64
+
+import six
 import nose
 
 from ipapython import ssh
 
+if six.PY3:
+    unicode = str
+
+
 def make_public_key_checker(pk, out):
     def check_public_key():
         try:
diff --git a/ipatests/test_ipaserver/test_install/test_adtrustinstance.py b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
index 9a62f87ce..75e53f35e 100755
--- a/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
+++ b/ipatests/test_ipaserver/test_install/test_adtrustinstance.py
@@ -21,10 +21,15 @@ Test `adtrustinstance`
 """
 
 import os
+
+import six
 import nose
 
 from ipaserver.install import adtrustinstance
 
+if six.PY3:
+    unicode = str
+
 class test_adtrustinstance:
     """
     Test `adtrustinstance`.
diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py
index f50c19a92..c3a9717c5 100644
--- a/ipatests/test_ipaserver/test_ldap.py
+++ b/ipatests/test_ipaserver/test_ldap.py
@@ -32,6 +32,7 @@ import pytest
 import nose
 from nose.tools import assert_raises  # pylint: disable=E0611
 import nss.nss as nss
+import six
 
 from ipaserver.plugins.ldap2 import ldap2
 from ipalib.plugins.service import service, service_show
@@ -41,6 +42,9 @@ from ipapython import ipautil
 from ipaplatform.paths import paths
 from ipapython.dn import DN
 
+if six.PY3:
+    unicode = str
+
 class test_ldap(object):
     """
     Test various LDAP client bind methods.
diff --git a/ipatests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py
index c77c2d97c..95980eb05 100644
--- a/ipatests/test_ipaserver/test_rpcserver.py
+++ b/ipatests/test_ipaserver/test_rpcserver.py
@@ -23,11 +23,16 @@ Test the `ipaserver.rpc` module.
 
 import json
 
+import six
+
 from ipatests.util import create_test_api, assert_equal, raises, PluginTester
 from ipatests.data import unicode_str
 from ipalib import errors, Command
 from ipaserver import rpcserver
 
+if six.PY3:
+    unicode = str
+
 
 class StartResponse(object):
     def __init__(self):
diff --git a/ipatests/test_util.py b/ipatests/test_util.py
index ba72a25db..a0ee7384e 100644
--- a/ipatests/test_util.py
+++ b/ipatests/test_util.py
@@ -23,9 +23,14 @@ Test the `tests.util` module.
 
 import re
 
+import six
+
 from ipatests import util
 from ipatests.util import raises, TYPE, VALUE, LEN, KEYS
 
+if six.PY3:
+    unicode = str
+
 
 class Prop(object):
     def __init__(self, *ops):
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"""
diff --git a/ipatests/util.py b/ipatests/util.py
index 2039095b0..d180c91b7 100644
--- a/ipatests/util.py
+++ b/ipatests/util.py
@@ -38,6 +38,9 @@ from ipalib.plugable import Plugin
 from ipalib.request import context
 from ipapython.dn import DN
 
+if six.PY3:
+    unicode = str
+
 
 class TempDir(object):
     def __init__(self):