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/test_caacl_profile_enforcement.py | |
| 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/test_caacl_profile_enforcement.py')
| -rw-r--r-- | ipatests/test_xmlrpc/test_caacl_profile_enforcement.py | 5 |
1 files changed, 5 insertions, 0 deletions
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') |