summaryrefslogtreecommitdiffstats
path: root/ipatests/test_ipapython/test_ssh.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-09-11 13:43:28 +0200
committerJan Cholasta <jcholast@redhat.com>2015-09-17 11:08:43 +0200
commit23507e6124041ed17f39db211e802495e37520e7 (patch)
tree8cf010848183a977fde0d5cdcd653556d215cd62 /ipatests/test_ipapython/test_ssh.py
parent1550b5ab50966387bac19f46b34a2107010d08d4 (diff)
downloadfreeipa-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_ipapython/test_ssh.py')
-rw-r--r--ipatests/test_ipapython/test_ssh.py6
1 files changed, 6 insertions, 0 deletions
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: