From e6a9de8a2ea453843e71ff717bee7dd74383db64 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Tue, 22 Aug 2017 10:10:57 +0200 Subject: [PATCH] py3: remove Exception.message appearances Exception.message is removed in Python3 https://pagure.io/freeipa/issue/4985 https://pagure.io/freeipa/issue/6874 Reviewed-By: Pavel Vomacka --- install/tools/ipa-adtrust-install | 4 ++-- install/tools/ipa-replica-manage | 2 +- ipaserver/plugins/baseldap.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index dc5b14e8c..d4e5d4c09 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -180,8 +180,8 @@ def main(): principal = krb_utils.get_principal() except errors.CCacheError as e: raise ScriptError( - "Must have Kerberos credentials to setup AD trusts on server: %s" - % e.message) + "Must have Kerberos credentials to setup AD trusts on server: " + "{err}".format(err=e)) try: api.Backend.ldap2.connect() diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index c8b4cd0ae..102addbdb 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -1447,7 +1447,7 @@ def set_DNA_range(hostname, range, realm, dirman_passwd, next_range=False, entries = repl.conn.get_entries(dn, repl.conn.SCOPE_ONELEVEL, "(objectclass=ipaDomainIDRange)") except errors.NotFound as e: - sys.exit('Unable to load IPA ranges: %s' % e.message) + sys.exit('Unable to load IPA ranges: {err}'.format(err=e)) for ent in entries: entry_start = int(ent.single_value['ipabaseid']) diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py index 47bd18427..220067ac1 100644 --- a/ipaserver/plugins/baseldap.py +++ b/ipaserver/plugins/baseldap.py @@ -412,7 +412,7 @@ def add_external_post_callback(ldap, dn, entry_attrs, failed, completed, elif (membername in lc_external_entries and member_dn not in members): # Already an external member, reset the error message - msg = unicode(errors.AlreadyGroupMember().message) + msg = unicode(errors.AlreadyGroupMember()) newerror = (entry[0], msg) ind = failed[memberattr][membertype].index(entry) failed[memberattr][membertype][ind] = newerror @@ -472,7 +472,7 @@ def remove_external_post_callback(ldap, dn, entry_attrs, failed, completed, external_entries.remove(entry[0]) completed_external += 1 else: - msg = unicode(errors.NotGroupMember().message) + msg = unicode(errors.NotGroupMember()) newerror = (entry[0], msg) ind = failed[memberattr][membertype].index(entry) failed[memberattr][membertype][ind] = newerror