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>
This commit is contained in:
Jan Cholasta
2015-09-11 13:43:28 +02:00
parent 1550b5ab50
commit 23507e6124
90 changed files with 394 additions and 0 deletions

View File

@@ -10,8 +10,13 @@ from ipalib.constants import DEFAULT_CONFIG
from ipapython.ipautil import kinit_keytab
import sys
import os, pwd
import six
import gssapi
if six.PY3:
unicode = str
def retrieve_keytab(api, ccache_name, oneway_keytab_name, oneway_principal):
getkeytab_args = ["/usr/sbin/ipa-getkeytab",
"-s", api.env.host,