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 /ipatests/test_xmlrpc/tracker | |
| 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>
Diffstat (limited to 'ipatests/test_xmlrpc/tracker')
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/certprofile_plugin.py | 4 | ||||
| -rw-r--r-- | ipatests/test_xmlrpc/tracker/user_plugin.py | 5 |
2 files changed, 9 insertions, 0 deletions
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 """ |