From 23507e6124041ed17f39db211e802495e37520e7 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Fri, 11 Sep 2015 13:43:28 +0200 Subject: 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 --- ipaserver/rpcserver.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ipaserver/rpcserver.py') diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 3b0fee534..298f8bab1 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -36,6 +36,7 @@ import time import ldap.controls from pyasn1.type import univ, namedtype from pyasn1.codec.ber import encoder +import six from ipalib import plugable, errors from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES @@ -62,6 +63,9 @@ from ipaplatform.paths import paths from ipapython.version import VERSION from ipalib.text import _ +if six.PY3: + unicode = str + HTTP_STATUS_SUCCESS = '200 Success' HTTP_STATUS_SERVER_ERROR = '500 Internal Server Error' -- cgit