Fix deprecation error of BaseException.message in Python 2.6

19 files changed, 23 insertions, 23 deletions

diff --git a/ipa-admintools/ipa-adddelegation b/ipa-admintools/ipa-adddelegation
index 4493390f..b76410bc 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 09ae9a67..64c09db6 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 15105bc0..0d5f04fd 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 cf1f4324..11030886 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 3cc94d4c..b18669e9 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 f11cf4b4..956f9e61 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 62ae3962..a9bfda1f 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 c295edc7..868e9a9e 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 4b0db7e6..aa29cd89 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 d9a9acc3..94e21b5e 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 c9aa4c05..af946a48 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 75df9493..e51760d6 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 85f2d5bf..8613533a 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 86e12c17..3e56edb9 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 6f5d7290..3493c152 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 ec483a5d..f290294e 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 616e6cac..8d1fdcbb 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 91b0f3ec..4f143918 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 9357bd74..96eef665 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