[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/ Get rid
of NotFoundError which was deprecated and to be removed for Zope 3.3
Philipp von Weitershausen
philikon at philikon.de
Tue Apr 4 10:16:38 EDT 2006
Log message for revision 66384:
Get rid of NotFoundError which was deprecated and to be removed for Zope 3.3
Changed:
U Zope3/branches/jim-adapter/src/zope/app/authentication/README.txt
U Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/exception/browser/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/exception/browser/ftests.py
U Zope3/branches/jim-adapter/src/zope/app/exception/browser/systemerror.txt
U Zope3/branches/jim-adapter/src/zope/app/fssync/fsregistry.py
U Zope3/branches/jim-adapter/src/zope/app/http/exception/configure.zcml
U Zope3/branches/jim-adapter/src/zope/app/security/interfaces.py
U Zope3/branches/jim-adapter/src/zope/app/security/principal.py
U Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py
U Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py
U Zope3/branches/jim-adapter/src/zope/app/traversing/api.py
U Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py
U Zope3/branches/jim-adapter/src/zope/app/undo/__init__.py
U Zope3/branches/jim-adapter/src/zope/exceptions/__init__.py
D Zope3/branches/jim-adapter/src/zope/exceptions/_notfounderror.py
U Zope3/branches/jim-adapter/src/zope/publisher/interfaces/__init__.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/authentication/README.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/authentication/README.txt 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/authentication/README.txt 2006-04-04 14:16:36 UTC (rev 66384)
@@ -360,15 +360,15 @@
>>> print pau.getPrincipal('xyz_bob')
Traceback (most recent call last):
- PrincipalLookupError: 'bob'
+ PrincipalLookupError: bob
>>> print pau.getPrincipal('white')
Traceback (most recent call last):
- PrincipalLookupError: 'white'
+ PrincipalLookupError: white
>>> print pau.getPrincipal('black')
Traceback (most recent call last):
- PrincipalLookupError: 'black'
+ PrincipalLookupError: black
For a PAU to support search, it needs to be configured with one or more
authenticator plugins that support search. To illustrate, we'll create a new
@@ -422,7 +422,7 @@
>>> print pau.getPrincipal('black')
Traceback (most recent call last):
- PrincipalLookupError: 'black'
+ PrincipalLookupError: black
Found Principal Creates Events
------------------------------
Modified: Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/copypastemove/__init__.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -17,8 +17,6 @@
"""
__docformat__ = 'restructuredtext'
-import zope.deprecation
-
from zope.interface import implements, Invalid
from zope.exceptions import DuplicationError
from zope.component import adapts
@@ -42,14 +40,9 @@
from zope.app.copypastemove.interfaces import IPrincipalClipboard
from zope.app.copypastemove.interfaces import IItemNotFoundError
-# BBB (remove in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
import warnings # BBB (remove in 3.3)
-class ItemNotFoundError(NotFoundError):
+class ItemNotFoundError(LookupError):
implements(IItemNotFoundError)
class ObjectMover(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/exception/browser/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/exception/browser/configure.zcml 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/exception/browser/configure.zcml 2006-04-04 14:16:36 UTC (rev 66384)
@@ -11,14 +11,6 @@
/>
<page
- for="zope.exceptions.INotFoundError"
- name="index.html"
- template="systemerror.pt"
- class="..systemerror.SystemErrorView"
- permission="zope.Public"
- />
-
- <page
for="zope.security.interfaces.IUnauthorized"
name="index.html"
permission="zope.Public"
Modified: Zope3/branches/jim-adapter/src/zope/app/exception/browser/ftests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/exception/browser/ftests.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/exception/browser/ftests.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -25,9 +25,9 @@
raise ComponentLookupError()
-class TestNotFound(functional.BrowserTestCase):
+class TestComponentLookupError(functional.BrowserTestCase):
- def testNotFound(self):
+ def testComponentLookupError(self):
response = self.publish('/foobar', basic='mgr:mgrpw',
handle_errors=True)
self.assertEqual(response.getStatus(), 404)
@@ -38,7 +38,7 @@
def test_suite():
return unittest.TestSuite((
- unittest.makeSuite(TestNotFound),
+ unittest.makeSuite(TestComponentLookupError),
functional.FunctionalDocFileSuite('systemerror.txt'),
))
Modified: Zope3/branches/jim-adapter/src/zope/app/exception/browser/systemerror.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/exception/browser/systemerror.txt 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/exception/browser/systemerror.txt 2006-04-04 14:16:36 UTC (rev 66384)
@@ -59,11 +59,11 @@
A system error occurred.
...
-Another way of getting a system error is the occurrence of an
-``INotFoundError``, such as ``ComponentLookupError``. I have registered a
-simple view in ``exception-ftesting.zcml`` that will raise a component lookup
-error. So if we call ``componentlookuperror.html``, we should get the error
-message:
+Another way of getting a system error is the occurrence of a system
+error, such as ``ComponentLookupError``. I have registered a simple
+view in ``exception-ftesting.zcml`` that will raise a component lookup
+error. So if we call ``componentlookuperror.html``, we should get the
+error message:
>>> print http(r"""
... GET /componentlookuperror.html HTTP/1.1
@@ -72,4 +72,3 @@
...
A system error occurred.
...
-
Modified: Zope3/branches/jim-adapter/src/zope/app/fssync/fsregistry.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/fssync/fsregistry.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/fssync/fsregistry.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -19,21 +19,12 @@
"""
__docformat__ = 'restructuredtext'
-import zope.deprecation
-
from zope.exceptions import DuplicationError
from zope.interface import implements
from zope.app.fssync.interfaces import IGlobalFSSyncUtility
from zope.app.fssync.interfaces import IFactoryNotFoundError
-# BBB Backward Compatibility (Can go away in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-class FactoryNotFoundError(NotFoundError):
- # BBB : NotFoundError inheritance
- # Backward Compatibility (Can go away in 3.3)
+class FactoryNotFoundError(LookupError):
implements(IFactoryNotFoundError)
class FSRegistry(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/http/exception/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/http/exception/configure.zcml 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/http/exception/configure.zcml 2006-04-04 14:16:36 UTC (rev 66384)
@@ -28,23 +28,7 @@
name="index.html"
/>
-<!-- BBB : can be removed in 3.3 -->
<view
- for="zope.exceptions.INotFoundError"
- type="zope.publisher.interfaces.http.IHTTPRequest"
- name="index.html"
- permission="zope.Public"
- factory=".notfound.NotFound"
- />
-
-<defaultView
- for="zope.exceptions.INotFoundError"
- type="zope.publisher.interfaces.http.IHTTPRequest"
- name="index.html"
- />
-<!-- END BBB : can be removed in 3.3 -->
-
-<view
for="zope.app.publication.http.IMethodNotAllowed"
factory="zope.app.http.exception.methodnotallowed.MethodNotAllowedView"
name="index.html"
Modified: Zope3/branches/jim-adapter/src/zope/app/security/interfaces.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/interfaces.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/security/interfaces.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -15,20 +15,12 @@
$Id$
"""
-
-import zope.deprecation
-
from zope.interface import Interface
from zope.schema import Text, TextLine
from zope.security.interfaces import IPrincipal, IPermission, IGroup
from zope.schema.interfaces import ISource
-# BBB : Can move away in 3.3
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-class PrincipalLookupError(NotFoundError):
+class PrincipalLookupError(LookupError):
"""A prncipal could not be found for a principal id
"""
Modified: Zope3/branches/jim-adapter/src/zope/app/security/principal.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/principal.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/security/principal.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -15,36 +15,16 @@
$Id$
"""
-
-import zope.deprecation
-
-from zope.app import zapi
+from zope.component import getUtility
from zope.app.security.interfaces import PrincipalLookupError
from zope.app.security.interfaces import IAuthentication
-# BBB Backward Compatibility (Can go away in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-import warnings
-
def checkPrincipal(context, principal_id):
-
- auth = zapi.getUtility(IAuthentication, context=context)
+ auth = getUtility(IAuthentication, context=context)
try:
if auth.getPrincipal(principal_id):
return
except PrincipalLookupError:
pass
- except NotFoundError: # BBB Backward Compatibility
- warnings.warn(
- "A %s instance raised a NotFoundError in "
- "getPrincipals. Raising NotFoundError in this "
- "method is deprecated and will no-longer be supported "
- "staring in Zope 3.3. PrincipalLookupError should "
- "be raised instead."
- % auth.__class__.__name__,
- DeprecationWarning)
raise ValueError("Undefined principal id", principal_id)
Modified: Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/security/vocabulary.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -17,8 +17,6 @@
$Id$
"""
-import zope.deprecation
-
from zope.security.checker import CheckerPublic
from zope.app import zapi
from zope.interface import implements
@@ -26,17 +24,9 @@
from zope.schema.interfaces import ISourceQueriables
from zope.app.security.interfaces import IPermission, IAuthentication
from zope.app.security.interfaces import PrincipalLookupError
+from zope.app.security.interfaces import IPrincipalSource
from zope.app.component import queryNextUtility
-# BBB Backward Compatibility
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-import warnings
-
-from interfaces import IPrincipalSource
-
class PermissionIdsVocabulary(SimpleVocabulary):
"""A vocabular of permission IDs.
@@ -157,16 +147,6 @@
auth.getPrincipal(id)
except PrincipalLookupError:
return False
- except NotFoundError: # BBB Backward Compatibility
- warnings.warn(
- "A %s instance raised a NotFoundError in "
- "getPrincipals. Raising NotFoundError in this "
- "method is deprecated and will no-longer be supported "
- "starting in Zope 3.3. PrincipalLookupError should "
- "be raised instead."
- % auth.__class__.__name__,
- DeprecationWarning)
- return False
else:
return True
Modified: Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/adapters.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -15,13 +15,10 @@
$Id$
"""
-import zope.deprecation
-
from types import StringTypes, MethodType
-
-from zope.app.traversing.interfaces import TraversalError
from zope.interface import implements
+from zope.app.traversing.interfaces import TraversalError
from zope.app.traversing.interfaces import IPhysicallyLocatable
from zope.app.traversing.interfaces import IContainmentRoot
from zope.app.traversing.interfaces import ITraverser, ITraversable
@@ -30,13 +27,6 @@
from zope.app.traversing.namespace import UnexpectedParameters
from zope.app.traversing.namespace import nsParse
-# BBB Backward Compatibility (Can go away in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-import warnings
-
_marker = object() # opaque marker that doesn't get security proxied
class DefaultTraversable(object):
@@ -182,18 +172,5 @@
return default
else:
raise
- except NotFoundError, v: # BBB Backward Compatibility
- warnings.warn(
- "A %s instance raised a NotFoundError in "
- "traverse. Raising NotFoundError in this "
- "method is deprecated and will no-longer be supported "
- "starting in Zope 3.3. TraversalError should "
- "be raised instead."
- % traversable.__class__.__name__,
- DeprecationWarning)
- if default is not _marker:
- return default
- else:
- raise
return obj
Modified: Zope3/branches/jim-adapter/src/zope/app/traversing/api.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/api.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/api.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -15,19 +15,11 @@
$Id$
"""
-import zope.deprecation
-
from zope.interface import moduleProvides
-from interfaces import IContainmentRoot, ITraversalAPI
-from interfaces import ITraverser, IPhysicallyLocatable, TraversalError
+from zope.app.traversing.interfaces import IContainmentRoot, ITraversalAPI
+from zope.app.traversing.interfaces import ITraverser, IPhysicallyLocatable
+from zope.app.traversing.interfaces import TraversalError
-# BBB Backward Compatibility (Can go away in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-import warnings
-
moduleProvides(ITraversalAPI)
__all__ = tuple(ITraversalAPI)
@@ -91,29 +83,11 @@
Consider using traverseName instead.
"""
traverser = ITraverser(object)
- try:
- if default is _marker:
- return traverser.traverse(path, request=request)
- else:
- return traverser.traverse(path, default=default, request=request)
+ if default is _marker:
+ return traverser.traverse(path, request=request)
+ else:
+ return traverser.traverse(path, default=default, request=request)
- # BBB Backward Compatibility, can go away in 3.3
- #
- except TraversalError:
- raise
- except NotFoundError, v:
- warnings.warn(
- "A %s instance raised a NotFoundError in "
- "traverse. Raising NotFoundError in this "
- "method is deprecated and will no-longer be supported "
- "staring in Zope 3.3. TraversalError should "
- "be raised instead."
- % traverser.__class__.__name__,
- DeprecationWarning)
- raise TraversalError(*tuple(v))
- #
- ###############################################################
-
def traverseName(obj, name, default=_marker, traversable=None, request=None):
"""Traverse a single step 'name' relative to the given object.
Modified: Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -17,7 +17,6 @@
"""
import re
-import zope.deprecation
import zope.component
import zope.interface
from zope.i18n.interfaces import IModifiableUserPreferredLanguages
@@ -30,14 +29,6 @@
from zope.app.traversing.interfaces import ITraversable, IPathAdapter
from zope.app.traversing.interfaces import TraversalError
-# BBB Backward Compatibility (Can go away in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-
-import warnings
-
-
class UnexpectedParameters(TraversalError):
"Unexpected namespace parameters were provided."
@@ -265,15 +256,6 @@
except TraversalError:
pass
- except NotFoundError, v: # BBB Backward Compatibility
- warnings.warn(
- "A %s instance raised a NotFoundError in "
- "traverse. Raising NotFoundError in this "
- "method is deprecated and will no-longer be supported "
- "staring in Zope 3.3. TraversalError should "
- "be raised instead."
- % traversable.__class__.__name__,
- DeprecationWarning)
else:
return next
Modified: Zope3/branches/jim-adapter/src/zope/app/undo/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/undo/__init__.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/app/undo/__init__.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -18,27 +18,18 @@
from datetime import datetime
import transaction
-
-import zope.deprecation
+import zope.component
from zope.interface import implements
-from zope.app.security.interfaces import PrincipalLookupError
-from zope.app import zapi
from zope.app.undo.interfaces import IUndoManager, UndoError
from zope.app.traversing.interfaces import IPhysicallyLocatable
from zope.app.security.principalregistry import principalRegistry
from zope.app.security.interfaces import IPrincipal
+from zope.app.security.interfaces import PrincipalLookupError
-# BBB Backward Compatibility (Can go away in 3.3)
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError
-zope.deprecation.__show__.on()
-import warnings
-
-
def undoSetup(event):
# setup undo functionality
- sm = zapi.getGlobalSiteManager()
+ sm = zope.component.getGlobalSiteManager()
sm.registerUtility(ZODBUndoManager(event.database), IUndoManager)
class Prefix(unicode):
@@ -158,15 +149,6 @@
except PrincipalLookupError:
# principals might have passed away
pass
- except NotFoundError: # BBB Backward Compatibility
- warnings.warn(
- "A %s instance raised a NotFoundError in "
- "getPrincipals. Raising NotFoundError in this "
- "method is deprecated and will no-longer be supported "
- "staring in Zope 3.3. PrincipalLookupError should "
- "be raised instead."
- % principalRegistry.__class__.__name__,
- DeprecationWarning)
return entries
def undoTransactions(self, ids):
Modified: Zope3/branches/jim-adapter/src/zope/exceptions/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/exceptions/__init__.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/exceptions/__init__.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -18,23 +18,6 @@
$Id$
"""
-import zope.deprecation
-zope.deprecation.deprecated('INotFoundError',
- 'This interface has been deprecated. '
- 'Use standard interface instead '
- 'The reference will be gone in 3.3')
-
-zope.deprecation.deprecated('NotFoundError',
- 'This class has been deprecated. '
- 'Use standard exceptions instead '
- 'The reference will be gone in 3.3')
-
-# Turn of deprecation warning here for the above import that are here for BBB
-# The depreaction above and within the _notfounderror module will do the job.
-zope.deprecation.__show__.off()
-from zope.exceptions._notfounderror import NotFoundError, INotFoundError
-zope.deprecation.__show__.on()
-
from zope.exceptions.interfaces import DuplicationError, IDuplicationError
from zope.exceptions.interfaces import UserError, IUserError
Deleted: Zope3/branches/jim-adapter/src/zope/exceptions/_notfounderror.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/exceptions/_notfounderror.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/exceptions/_notfounderror.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -1,48 +0,0 @@
-##############################################################################
-#
-# 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.1 (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.
-#
-##############################################################################
-"""Not Found Error
-
-$Id$
-"""
-
-from zope.deprecation import deprecated
-
-from zope.interface.common.interfaces import IKeyError
-from zope.interface import implements
-
-deprecated('INotFoundError',
- 'This interface has been deprecated. '
- 'Use standard interface instead '
- 'The reference will be gone in 3.3')
-
-deprecated('NotFoundError',
- 'This class has been deprecated. '
- 'Use standard exceptions instead '
- 'The reference will be gone in 3.3')
-
-class INotFoundError(IKeyError):
- pass
-
-class NotFoundError(KeyError, LookupError):
- """A resource could not be found.
-
- This exception is deprecated. It will, over time, be replaced
- with more specific exception types.
-
- Eventually, when this exception type is used as a base class, it
- will become an alias for LookupError. Client code should not depend
- on it extnding KeyError.
-
- """
- implements(INotFoundError)
Modified: Zope3/branches/jim-adapter/src/zope/publisher/interfaces/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/publisher/interfaces/__init__.py 2006-04-04 13:30:42 UTC (rev 66383)
+++ Zope3/branches/jim-adapter/src/zope/publisher/interfaces/__init__.py 2006-04-04 14:16:36 UTC (rev 66384)
@@ -15,27 +15,15 @@
$Id$
"""
-
__docformat__ = "reStructuredText"
-import zope.deprecation
-
-from zope.interface import Interface
-from zope.interface import Attribute
-from zope.security.interfaces import Unauthorized
from zope.component.interfaces import IPresentationRequest
-from zope.interface import implements
+from zope.interface import Interface, Attribute, implements
from zope.interface.interfaces import IInterface
from zope.interface.common.mapping import IEnumerableMapping
-from zope.interface.common.interfaces import IException
-from zope.security.interfaces import IParticipation
+from zope.interface.common.interfaces import IException, ILookupError
+from zope.security.interfaces import Unauthorized, IParticipation
-# BBB : can be remove in 3.3
-zope.deprecation.__show__.off()
-from zope.exceptions import NotFoundError, INotFoundError
-zope.deprecation.__show__.on()
-
-
class IPublishingException(IException):
pass
@@ -48,14 +36,14 @@
class TraversalException(PublishingException):
implements(ITraversalException)
-class INotFound(INotFoundError, ITraversalException):
+class INotFound(ILookupError, ITraversalException):
def getObject():
'Returns the object that was being traversed.'
def getName():
'Returns the name that was being traversed.'
-class NotFound(NotFoundError, TraversalException):
+class NotFound(LookupError, TraversalException):
implements(INotFound)
def __init__(self, ob, name, request=None):
More information about the Zope3-Checkins
mailing list