Skip to content

Commit

Permalink
Python has deprecated the message attribute of exceptions in 2.6. We …
Browse files Browse the repository at this point in the history
…will keep it for this exception and avoid the warning, as message has a special meaning here.
  • Loading branch information
hannosch committed Jan 17, 2009
1 parent 9e836fd commit 7793159
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions unauthorized.py
Expand Up @@ -14,7 +14,6 @@
$Id$
"""

from types import StringType
from zope.interface import implements
from zope.security.interfaces import IUnauthorized

Expand All @@ -38,7 +37,7 @@ def __init__(self, message=None, value=None, needed=None, name=None, **kw):
provides are added to needed.
"""
if name is None and (
not isinstance(message, StringType) or len(message.split()) <= 1):
not isinstance(message, basestring) or len(message.split()) <= 1):
# First arg is a name, not a message
name=message
message=None
Expand All @@ -53,8 +52,17 @@ def __init__(self, message=None, value=None, needed=None, name=None, **kw):

self.needed=needed

# Python has deprecated the message attribute of exceptions in 2.6. We
# will keep it for this exception and avoid the warning.
def _get_message(self, message):
return self._message
def _set_message(self, message):
self._message = message
message = property(_get_message, _set_message)

def __str__(self):
if self.message is not None: return self.message
if self.message is not None:
return self.message
if self.name is not None:
return ("You are not allowed to access '%s' in this context"
% self.name)
Expand All @@ -63,7 +71,6 @@ def __str__(self):
% self.getValueName())
return repr(self)


def getValueName(self):
v=self.value
vname=getattr(v, '__name__', None)
Expand Down

0 comments on commit 7793159

Please sign in to comment.