diff options
author | Rob Crittenden <rcritten@redhat.com> | 2009-07-29 11:29:59 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-07-30 13:55:33 -0400 |
commit | 7062134e72a74af2036ad653296201d678f6a89b (patch) | |
tree | ce8cdf020962696f2d42c8ae4e4415e131381f81 | |
parent | 8ab2977eeb79571ed6f976a12a51ed2b75cdc12b (diff) | |
download | freeipa-7062134e72a74af2036ad653296201d678f6a89b.tar.gz freeipa-7062134e72a74af2036ad653296201d678f6a89b.tar.xz freeipa-7062134e72a74af2036ad653296201d678f6a89b.zip |
Fix deprecation error of BaseException.message in Python 2.6
-rw-r--r-- | ipa-admintools/ipa-adddelegation | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-addgroup | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-addservice | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-adduser | 4 | ||||
-rw-r--r-- | ipa-admintools/ipa-defaultoptions | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-deldelegation | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-delgroup | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-delservice | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-deluser | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-findgroup | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-findservice | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-finduser | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-lockuser | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-moddelegation | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-modgroup | 4 | ||||
-rw-r--r-- | ipa-admintools/ipa-moduser | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-passwd | 2 | ||||
-rw-r--r-- | ipa-admintools/ipa-pwpolicy | 2 | ||||
-rw-r--r-- | ipa-python/ipaerror.py | 6 |
19 files changed, 23 insertions, 23 deletions
diff --git a/ipa-admintools/ipa-adddelegation b/ipa-admintools/ipa-adddelegation index 4493390f9..b76410bc2 100644 --- a/ipa-admintools/ipa-adddelegation +++ b/ipa-admintools/ipa-adddelegation @@ -191,7 +191,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup index 09ae9a670..64c09db65 100644 --- a/ipa-admintools/ipa-addgroup +++ b/ipa-admintools/ipa-addgroup @@ -152,7 +152,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-addservice b/ipa-admintools/ipa-addservice index 15105bc0f..0d5f04fdc 100644 --- a/ipa-admintools/ipa-addservice +++ b/ipa-admintools/ipa-addservice @@ -94,7 +94,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser index cf1f43244..110308864 100644 --- a/ipa-admintools/ipa-adduser +++ b/ipa-admintools/ipa-adduser @@ -242,7 +242,7 @@ def main(): client.modifyPassword(principal, '', password) except ipa.ipaerror.IPAError, e: print "User added but setting the password failed." - print "%s" % (e.message) + print "%s" % (e.msg) return 1 print username + " successfully added" @@ -280,7 +280,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-defaultoptions b/ipa-admintools/ipa-defaultoptions index 3cc94d4c7..b18669e9f 100644 --- a/ipa-admintools/ipa-defaultoptions +++ b/ipa-admintools/ipa-defaultoptions @@ -171,7 +171,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-deldelegation b/ipa-admintools/ipa-deldelegation index f11cf4b4e..956f9e617 100644 --- a/ipa-admintools/ipa-deldelegation +++ b/ipa-admintools/ipa-deldelegation @@ -133,7 +133,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-delgroup b/ipa-admintools/ipa-delgroup index 62ae3962b..a9bfda1f1 100644 --- a/ipa-admintools/ipa-delgroup +++ b/ipa-admintools/ipa-delgroup @@ -99,7 +99,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-delservice b/ipa-admintools/ipa-delservice index c295edc73..868e9a9e2 100644 --- a/ipa-admintools/ipa-delservice +++ b/ipa-admintools/ipa-delservice @@ -100,7 +100,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-deluser b/ipa-admintools/ipa-deluser index 4b0db7e63..aa29cd89e 100644 --- a/ipa-admintools/ipa-deluser +++ b/ipa-admintools/ipa-deluser @@ -80,7 +80,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup index d9a9acc39..94e21b5e0 100644 --- a/ipa-admintools/ipa-findgroup +++ b/ipa-admintools/ipa-findgroup @@ -147,7 +147,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-findservice b/ipa-admintools/ipa-findservice index c9aa4c058..af946a48a 100644 --- a/ipa-admintools/ipa-findservice +++ b/ipa-admintools/ipa-findservice @@ -95,7 +95,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser index 75df9493f..e51760d6f 100644 --- a/ipa-admintools/ipa-finduser +++ b/ipa-admintools/ipa-finduser @@ -167,7 +167,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-lockuser b/ipa-admintools/ipa-lockuser index 85f2d5bfb..8613533a9 100644 --- a/ipa-admintools/ipa-lockuser +++ b/ipa-admintools/ipa-lockuser @@ -99,7 +99,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-moddelegation b/ipa-admintools/ipa-moddelegation index 86e12c17b..3e56edb9d 100644 --- a/ipa-admintools/ipa-moddelegation +++ b/ipa-admintools/ipa-moddelegation @@ -231,7 +231,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-modgroup b/ipa-admintools/ipa-modgroup index 6f5d72909..3493c152c 100644 --- a/ipa-admintools/ipa-modgroup +++ b/ipa-admintools/ipa-modgroup @@ -106,7 +106,7 @@ def get_group(client, options, group_cn): group = client.get_entry_by_cn(group_cn, sattrs=attrs) except ipa.ipaerror.IPAError, e: - print "%s" % e.message + print "%s" % e.msg return None return group @@ -224,7 +224,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser index ec483a5d9..f290294ec 100644 --- a/ipa-admintools/ipa-moduser +++ b/ipa-admintools/ipa-moduser @@ -246,7 +246,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-passwd b/ipa-admintools/ipa-passwd index 616e6cac8..8d1fdcbb4 100644 --- a/ipa-admintools/ipa-passwd +++ b/ipa-admintools/ipa-passwd @@ -136,7 +136,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-admintools/ipa-pwpolicy b/ipa-admintools/ipa-pwpolicy index 91b0f3ecc..4f143918e 100644 --- a/ipa-admintools/ipa-pwpolicy +++ b/ipa-admintools/ipa-pwpolicy @@ -143,7 +143,7 @@ except xmlrpclib.ProtocolError, e: print "Unable to connect to IPA server: %s" % (e.errmsg) sys.exit(1) except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) + print "%s" % (e.msg) sys.exit(1) except socket.error, e: print e[1] diff --git a/ipa-python/ipaerror.py b/ipa-python/ipaerror.py index 9357bd741..96eef6652 100644 --- a/ipa-python/ipaerror.py +++ b/ipa-python/ipaerror.py @@ -27,7 +27,7 @@ class IPAError(exceptions.Exception): detail is an optional exception that provides more detail about the error.""" self.code = code - self.message = message + self.msg = message # Fill this in as an empty LDAP error message so we don't have a lot # of "if e.detail ..." everywhere if detail is None: @@ -36,10 +36,10 @@ class IPAError(exceptions.Exception): self.detail = detail def __str__(self): - return self.message + return self.msg def __repr__(self): - repr = "%d: %s" % (self.code, self.message) + repr = "%d: %s" % (self.code, self.msg) if self.detail: repr += "\n%s" % str(self.detail) return repr |