From dd16cc98b0d67f1448bf9de25f8adce512b1431c Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 10 Aug 2015 18:29:33 +0200 Subject: Use six.string_types instead of "basestring" Reviewed-By: Christian Heimes Reviewed-By: Jan Cholasta --- ipalib/messages.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ipalib/messages.py') diff --git a/ipalib/messages.py b/ipalib/messages.py index 58ae1f3ec..4615cbc2b 100644 --- a/ipalib/messages.py +++ b/ipalib/messages.py @@ -32,6 +32,8 @@ Messages also have the 'type' argument, set to one of 'debug', 'info', from inspect import isclass +import six + from ipalib.constants import TYPE_ERROR from ipalib.text import _ as ugettext from ipalib.text import Gettext, NGettext @@ -60,7 +62,7 @@ def process_message_arguments(obj, format=None, message=None, **kw): obj.format = format obj.forwarded = False obj.msg = obj.format % kw - if isinstance(obj.format, basestring): + if isinstance(obj.format, six.string_types): obj.strerror = ugettext(obj.format) % kw else: obj.strerror = obj.format % kw -- cgit