[Zope3-checkins] CVS: Zope3/src/zope/exceptions - __init__.py:1.1.2.2 _duplicate.py:1.1.2.2 _forbidden.py:1.1.2.2 _notfounderror.py:1.1.2.2 _zope_error.py:1.1.2.2 exceptionformatter.py:1.1.2.2 interfaces.py:1.1.2.3 unauthorized.py:1.1.2.2
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:37 -0500
Update of /cvs-repository/Zope3/src/zope/exceptions
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/exceptions
Modified Files:
Tag: NameGeddon-branch
__init__.py _duplicate.py _forbidden.py _notfounderror.py
_zope_error.py exceptionformatter.py interfaces.py
unauthorized.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/exceptions/__init__.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/__init__.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/__init__.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""General exceptions that wish they were standard exceptions
@@ -24,4 +24,3 @@
from zope.exceptions._notfounderror import NotFoundError
from zope.exceptions._forbidden import Forbidden, ForbiddenAttribute
from zope.exceptions._duplicate import DuplicationError
-
=== Zope3/src/zope/exceptions/_duplicate.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/_duplicate.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/_duplicate.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
=== Zope3/src/zope/exceptions/_forbidden.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/_forbidden.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/_forbidden.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
@@ -23,5 +23,3 @@
class ForbiddenAttribute(Forbidden, AttributeError):
"""An attribute is unavailable because it is forbidden (private)
"""
-
-
=== Zope3/src/zope/exceptions/_notfounderror.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/_notfounderror.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/_notfounderror.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
=== Zope3/src/zope/exceptions/_zope_error.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/_zope_error.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/_zope_error.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Base class for Zope application errors.
=== Zope3/src/zope/exceptions/exceptionformatter.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/exceptionformatter.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/exceptionformatter.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""An exception formatter that shows traceback supplements and traceback info,
optionally in HTML.
@@ -237,4 +237,3 @@
else:
fmt = text_formatter
return fmt.formatException(t, v, tb)
-
=== Zope3/src/zope/exceptions/interfaces.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/exceptions/interfaces.py:1.1.2.2 Mon Dec 23 15:49:33 2002
+++ Zope3/src/zope/exceptions/interfaces.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""ITracebackSupplement interface definition.
=== Zope3/src/zope/exceptions/unauthorized.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/exceptions/unauthorized.py:1.1.2.1 Mon Dec 23 14:32:49 2002
+++ Zope3/src/zope/exceptions/unauthorized.py Tue Dec 24 21:21:05 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
$Id$
@@ -30,7 +30,7 @@
Unauthorized(name, value)
Unauthorized(name, value, needed)
Unauthorized(message, value, needed, name)
-
+
Where needed is a mapping objects with items represnting requirements
(e.g. {'permission': 'add spam'}). Any extra keyword arguments
provides are added to needed.
@@ -40,7 +40,7 @@
# First arg is a name, not a message
name=message
message=None
-
+
self.name=name
self.message=message
self.value=value
@@ -48,7 +48,7 @@
if kw:
if needed: needed.update(kw)
else: needed=kw
-
+
self.needed=needed
def __str__(self):
@@ -59,8 +59,8 @@
elif self.value is not None:
return ("You are not allowed to access %s in this context"
% self.getValueName())
-
-
+
+
def getValueName(self):
v=self.value
vname=getattr(v, '__name__', None)
@@ -68,4 +68,3 @@
c = getattr(v, '__class__', type(v))
c = getattr(c, '__name__', 'object')
return "a particular %s" % c
-