summaryrefslogtreecommitdiffstats
path: root/ipalib/cli.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2015-08-10 18:29:33 +0200
committerJan Cholasta <jcholast@redhat.com>2015-09-01 11:42:01 +0200
commitdd16cc98b0d67f1448bf9de25f8adce512b1431c (patch)
treee9fa6c41da6894b16a366b02d61c29b15c5a9b4a /ipalib/cli.py
parent404177f7a322ced4e05cfc6b2ed330b6fcce0c04 (diff)
downloadfreeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.gz
freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.xz
freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.zip
Use six.string_types instead of "basestring"
Reviewed-By: Christian Heimes <cheimes@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipalib/cli.py')
-rw-r--r--ipalib/cli.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index abd691bc1..9c6d570f7 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -31,6 +31,9 @@ import termios
import struct
import base64
import traceback
+
+import six
+
try:
#pylint: disable=F0401
import default_encoding_utf8
@@ -280,7 +283,7 @@ class textui(backend.Backend):
objectClass: top
objectClass: someClass
"""
- assert isinstance(attr, basestring)
+ assert isinstance(attr, six.string_types)
if not isinstance(value, (list, tuple)):
# single-value attribute
self.print_indented(format % (attr, self.encode_binary(value)), indent)
@@ -420,7 +423,7 @@ class textui(backend.Backend):
------------------
Only dashed above.
"""
- assert isinstance(dash, basestring)
+ assert isinstance(dash, six.string_types)
assert len(dash) == 1
dashes = dash * len(string)
if above: