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_cmdline | |
| 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_cmdline')
| -rw-r--r-- | ipatests/test_cmdline/test_cli.py | 4 | ||||
| -rw-r--r-- | ipatests/test_cmdline/test_help.py | 4 |
2 files changed, 8 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 |