[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/ Merged from trunk

[Jim Fulton]

Log message for revision 26796:
  Merged from trunk
  
    r26795 | jim | 2004-07-27 11:15:58 -0400 (Tue, 27 Jul 2004) | 2 lines
  
  Got rid of (the pointless) ZopeError.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/exceptions/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_duplicate.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_notfounderror.py
  D   Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_zope_error.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py	2004-07-27 15:15:58 UTC (rev 26795)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/component/interface.py	2004-07-27 15:23:30 UTC (rev 26796)
@@ -100,7 +100,7 @@
     >>> getInterface(None, 'zope.app.component.interface.I4')
     Traceback (most recent call last):
     ...
-    ComponentLookupError: zope.app.component.interface.I4
+    ComponentLookupError: 'zope.app.component.interface.I4'
     >>> provideInterface('', I4, IContentType)
     >>> IContentType.providedBy(I4)
     True

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py	2004-07-27 15:15:58 UTC (rev 26795)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/traversing/namespace.py	2004-07-27 15:23:30 UTC (rev 26796)
@@ -68,7 +68,7 @@
          >>> namespaceLookup('fiz', 'bar', C())
          Traceback (most recent call last):
          ...
-         NotFoundError: ++fiz++bar
+         NotFoundError: '++fiz++bar'
 
        We'll get the same thing if we provide a request:
 
@@ -77,7 +77,7 @@
          >>> namespaceLookup('foo', 'bar', C(), request)
          Traceback (most recent call last):
          ...
-         NotFoundError: ++foo++bar
+         NotFoundError: '++foo++bar'
 
        We need to provide a view:
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/exceptions/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/exceptions/__init__.py	2004-07-27 15:15:58 UTC (rev 26795)
+++ Zope3/branches/ZopeX3-3.0/src/zope/exceptions/__init__.py	2004-07-27 15:23:30 UTC (rev 26796)
@@ -19,7 +19,6 @@
 $Id$
 """
 
-from zope.exceptions._zope_error import ZopeError, IZopeError
 from zope.exceptions._notfounderror import NotFoundError, INotFoundError
 from zope.exceptions._duplicate import DuplicationError, IDuplicationError
 

Modified: Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_duplicate.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_duplicate.py	2004-07-27 15:15:58 UTC (rev 26795)
+++ Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_duplicate.py	2004-07-27 15:23:30 UTC (rev 26796)
@@ -14,12 +14,11 @@
 """
 $Id$
 """
-from zope.exceptions import ZopeError, IZopeError
-from zope.interface import implements
+from zope.interface import implements, Interface
 
-class IDuplicationError(IZopeError):
+class IDuplicationError(Interface):
     pass
 
-class DuplicationError(ZopeError):
+class DuplicationError(Exception):
     """A duplicate registration was attempted"""
     implements(IDuplicationError)

Modified: Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_notfounderror.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_notfounderror.py	2004-07-27 15:15:58 UTC (rev 26795)
+++ Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_notfounderror.py	2004-07-27 15:23:30 UTC (rev 26796)
@@ -14,14 +14,13 @@
 """
 $Id$
 """
-from zope.exceptions import ZopeError, IZopeError
 from zope.interface.common.interfaces import IKeyError
 from zope.interface import implements
 
-class INotFoundError(IZopeError, IKeyError):
+class INotFoundError(IKeyError):
     pass
 
-class NotFoundError(ZopeError, KeyError):
+class NotFoundError(KeyError):
     """A resource could not be found.
     """
     implements(INotFoundError)

Deleted: Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_zope_error.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_zope_error.py	2004-07-27 15:15:58 UTC (rev 26795)
+++ Zope3/branches/ZopeX3-3.0/src/zope/exceptions/_zope_error.py	2004-07-27 15:23:30 UTC (rev 26796)
@@ -1,26 +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.
-#
-##############################################################################
-"""Base class for Zope application errors.
-
-$Id$
-"""
-from zope.interface.common.interfaces import IException
-from zope.interface import implements
-
-class IZopeError(IException):
-    pass
-
-class ZopeError(Exception):
-    """Generic base class for Zope errors."""
-    implements(IZopeError)