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 --- ipapython/sysrestore.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ipapython/sysrestore.py') diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py index 24ddc9a47..8ce8e4b7a 100644 --- a/ipapython/sysrestore.py +++ b/ipapython/sysrestore.py @@ -31,10 +31,15 @@ import ConfigParser import random import string +import six + from ipapython import ipautil from ipaplatform.tasks import tasks from ipaplatform.paths import paths +if six.PY3: + unicode = str + SYSRESTORE_PATH = paths.TMP SYSRESTORE_INDEXFILE = "sysrestore.index" SYSRESTORE_STATEFILE = "sysrestore.state" -- cgit