From dacfddfdc8be7411abef5bd1c1107907f545dc6f Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 20 Aug 2009 10:15:57 -0400 Subject: Remove Python 2.6 BaseException.message deprecation warning --- ipalib/errors.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ipalib/errors.py') diff --git a/ipalib/errors.py b/ipalib/errors.py index 2edefa746..ad5f584f1 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -111,13 +111,13 @@ class PrivateError(StandardError): format = '' def __init__(self, **kw): - self.message = self.format % kw + self.msg = self.format % kw for (key, value) in kw.iteritems(): assert not hasattr(self, key), 'conflicting kwarg %s.%s = %r' % ( self.__class__.__name__, key, value, ) setattr(self, key, value) - StandardError.__init__(self, self.message) + StandardError.__init__(self, self.msg) class SubprocessError(PrivateError): @@ -258,7 +258,7 @@ class PublicError(StandardError): ) self.format = format self.forwarded = False - self.message = self.format % kw + self.msg = self.format % kw self.strerror = ugettext(self.format) % kw else: if type(message) is not unicode: @@ -266,14 +266,14 @@ class PublicError(StandardError): TYPE_ERROR % ('message', unicode, message, type(message)) ) self.forwarded = True - self.message = message + self.msg = message self.strerror = message for (key, value) in kw.iteritems(): assert not hasattr(self, key), 'conflicting kwarg %s.%s = %r' % ( name, key, value, ) setattr(self, key, value) - StandardError.__init__(self, self.message) + StandardError.__init__(self, self.msg) class VersionError(PublicError): -- cgit