summaryrefslogtreecommitdiffstats
path: root/ipapython/sysrestore.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 /ipapython/sysrestore.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 'ipapython/sysrestore.py')
-rw-r--r--ipapython/sysrestore.py5
1 files changed, 5 insertions, 0 deletions
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"