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

Remove Python 2.6 BaseException.message deprecation warning

Browse Source
This commit is contained in:
Rob Crittenden 2009-08-20 10:15:57 -04:00 committed by Jason Gerard DeRose
parent d9c54cd83e
commit dacfddfdc8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipalib/errors.py
View File

@ -111,13 +111,13 @@ class PrivateError(StandardError):
format = '' format = ''
def __init__(self, **kw): def __init__(self, **kw):
self.message = self.format % kw self.msg = self.format % kw
for (key, value) in kw.iteritems(): for (key, value) in kw.iteritems():
assert not hasattr(self, key), 'conflicting kwarg %s.%s = %r' % ( assert not hasattr(self, key), 'conflicting kwarg %s.%s = %r' % (
self.__class__.__name__, key, value, self.__class__.__name__, key, value,
) )
setattr(self, key, value) setattr(self, key, value)
StandardError.__init__(self, self.message) StandardError.__init__(self, self.msg)
class SubprocessError(PrivateError): class SubprocessError(PrivateError):
@ -258,7 +258,7 @@ class PublicError(StandardError):
) )
self.format = format self.format = format
self.forwarded = False self.forwarded = False
self.message = self.format % kw self.msg = self.format % kw
self.strerror = ugettext(self.format) % kw self.strerror = ugettext(self.format) % kw
else: else:
if type(message) is not unicode: if type(message) is not unicode:
@ -266,14 +266,14 @@ class PublicError(StandardError):
TYPE_ERROR % ('message', unicode, message, type(message)) TYPE_ERROR % ('message', unicode, message, type(message))
) )
self.forwarded = True self.forwarded = True
self.message = message self.msg = message
self.strerror = message self.strerror = message
for (key, value) in kw.iteritems(): for (key, value) in kw.iteritems():
assert not hasattr(self, key), 'conflicting kwarg %s.%s = %r' % ( assert not hasattr(self, key), 'conflicting kwarg %s.%s = %r' % (
name, key, value, name, key, value,
) )
setattr(self, key, value) setattr(self, key, value)
StandardError.__init__(self, self.message) StandardError.__init__(self, self.msg)
class VersionError(PublicError): class VersionError(PublicError):