IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: remove Exception.message appearances

Browse Source 
Exception.message is removed in Python3

https://pagure.io/freeipa/issue/4985
https://pagure.io/freeipa/issue/6874

Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
This commit is contained in:
Stanislav Laznicka
2017-08-22 10:10:57 +02:00
committed by Pavel Vomacka
parent 7a86ff5d9b
commit e6a9de8a2e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/tools/ipa-adtrust-install
View File

@@ -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()

2
install/tools/ipa-replica-manage
View File

@@ -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'])

4
ipaserver/plugins/baseldap.py
View File

@@ -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