[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/
zope.component.exceptions is deprecated (though it doesn't
generate a warning).
Philipp von Weitershausen
philikon at philikon.de
Wed Mar 1 01:29:48 EST 2006
Log message for revision 65663:
zope.component.exceptions is deprecated (though it doesn't generate a warning).
The proper import location for ComponentLookupError is zope.component.interfaces.
Changed:
U Zope3/branches/jim-adapter/src/zope/app/component/bbb/localservice.py
U Zope3/branches/jim-adapter/src/zope/app/component/browser/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/component/fields.py
U Zope3/branches/jim-adapter/src/zope/app/component/hooks.py
U Zope3/branches/jim-adapter/src/zope/app/component/interface.py
U Zope3/branches/jim-adapter/src/zope/app/component/site.py
U Zope3/branches/jim-adapter/src/zope/app/component/tests/test_contentdirective.py
U Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py
U Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_adding.py
U Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_directives.py
U Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py
U Zope3/branches/jim-adapter/src/zope/app/form/tests/test_utility.py
U Zope3/branches/jim-adapter/src/zope/app/introspector/browser.py
U Zope3/branches/jim-adapter/src/zope/app/pagetemplate/engine.py
U Zope3/branches/jim-adapter/src/zope/app/presentation/tests/test_presentation.py
U Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fields.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/browser/viewmeta.py
U Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_fieldfactory.py
U Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_interfaceutility.py
U Zope3/branches/jim-adapter/src/zope/app/schemacontent/browser/__init__.py
U Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py
U Zope3/branches/jim-adapter/src/zope/app/sqlexpr/sqlexpr.py
U Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py
U Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py
U Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py
U Zope3/branches/jim-adapter/src/zope/component/bbb/adapter.py
U Zope3/branches/jim-adapter/src/zope/component/bbb/utility.py
-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/component/bbb/localservice.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/bbb/localservice.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/bbb/localservice.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -1,6 +1,6 @@
# BBB: Goes away in 3.3
import zope.deprecation
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
def queryNextService(context, name, default=None):
try:
Modified: Zope3/branches/jim-adapter/src/zope/app/component/browser/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/browser/__init__.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/browser/__init__.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -27,7 +27,7 @@
from zope.app.publisher.browser import BrowserView
from zope.app.component.interfaces import ISite
from zope.app.component.site import LocalSiteManager
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.component.interfaces import IFactory
from zope.interface.interfaces import IMethod
from zope.schema.interfaces import IField
Modified: Zope3/branches/jim-adapter/src/zope/app/component/fields.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/fields.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/fields.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -18,7 +18,7 @@
__docformat__ = 'restructuredtext'
import zope.schema
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.configuration.exceptions import ConfigurationError
from zope.configuration.fields import GlobalObject
from zope.publisher.interfaces.browser import ILayer
Modified: Zope3/branches/jim-adapter/src/zope/app/component/hooks.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/hooks.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/hooks.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -94,7 +94,7 @@
def adapter_hook(interface, object, name='', default=None):
try:
return siteinfo.adapter_hook(interface, object, name, default)
- except zope.component.exceptions.ComponentLookupError:
+ except zope.component.interfaces.ComponentLookupError:
return default
Modified: Zope3/branches/jim-adapter/src/zope/app/component/interface.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/interface.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/interface.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
from types import ClassType
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import directlyProvides, directlyProvidedBy
from zope.interface.interfaces import IInterface
from zope.app import zapi
Modified: Zope3/branches/jim-adapter/src/zope/app/component/site.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/site.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/site.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -28,7 +28,7 @@
import zope.event
import zope.interface
import zope.component.components
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.security.proxy import removeSecurityProxy
from zope.app import zapi
Modified: Zope3/branches/jim-adapter/src/zope/app/component/tests/test_contentdirective.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/tests/test_contentdirective.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/tests/test_contentdirective.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -23,7 +23,7 @@
from zope.app import zapi
from zope.component.interfaces import IFactory
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.component.interface import queryInterface
Modified: Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/component/tests/test_directives.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -36,7 +36,7 @@
from zope.security.checker import selectChecker
import zope.app.component
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.app import zapi
from zope.app.testing.placelesssetup import PlacelessSetup
Modified: Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_adding.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_adding.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/container/browser/tests/test_adding.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -20,7 +20,7 @@
import zope.interface
import zope.security.checker
from zope.component.interfaces import IFactory
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import implements, Interface, directlyProvides
from zope.publisher.browser import TestRequest
from zope.publisher.interfaces.browser import IBrowserRequest
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_directives.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_directives.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_directives.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -19,7 +19,7 @@
import unittest
from cStringIO import StringIO
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.configuration.xmlconfig import xmlconfig, XMLConfig
from zope.app.traversing.interfaces import TraversalError
from zope.interface import Interface, implements
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_editview.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -21,7 +21,7 @@
from zope.publisher.browser import TestRequest
from zope.schema import TextLine, accessors
from zope.schema.interfaces import ITextLine
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.app.testing import ztapi
from zope.app.testing.placelesssetup import PlacelessSetup
@@ -30,7 +30,7 @@
from zope.app.form.browser import TextWidget
from zope.app.form.browser.editview import EditView
from zope.app.form.browser.submit import Update
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.app.form.interfaces import IInputWidget
from zope.app.form.tests import utils
from zope.app.location.interfaces import ILocation
Modified: Zope3/branches/jim-adapter/src/zope/app/form/tests/test_utility.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/tests/test_utility.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/form/tests/test_utility.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -18,8 +18,7 @@
import doctest
from zope.interface import Interface, implements
-from zope.component.interfaces import IViewFactory
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import IViewFactory, ComponentLookupError
from zope.publisher.browser import TestRequest
import zope.security.checker
from zope.security.interfaces import ForbiddenAttribute, Unauthorized
Modified: Zope3/branches/jim-adapter/src/zope/app/introspector/browser.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/introspector/browser.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/introspector/browser.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import directlyProvides, directlyProvidedBy
from zope.proxy import removeAllProxies
Modified: Zope3/branches/jim-adapter/src/zope/app/pagetemplate/engine.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/pagetemplate/engine.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/pagetemplate/engine.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -28,7 +28,7 @@
from zope.tales.pythonexpr import PythonExpr
from zope.tales.tales import ExpressionEngine, Context
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.app.traversing.interfaces import TraversalError
from zope.security.untrustedpython import rcompile
from zope.security.proxy import ProxyFactory
Modified: Zope3/branches/jim-adapter/src/zope/app/presentation/tests/test_presentation.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/presentation/tests/test_presentation.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/presentation/tests/test_presentation.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -18,7 +18,7 @@
import unittest
import zope.interface
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.configuration.exceptions import ConfigurationError
from zope.interface.verify import verifyObject
from zope.proxy import removeAllProxies
Modified: Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/publication/tests/test_zopepublication.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -27,7 +27,7 @@
from zope.interface.verify import verifyClass
from zope.interface import implements, classImplements, implementedBy
from zope.i18n.interfaces import IUserPreferredCharsets
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.publisher.base import TestPublication, TestRequest
from zope.publisher.http import IHTTPRequest, HTTPCharsets
from zope.publisher.interfaces import IRequest, IPublishTraverse
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fields.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fields.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fields.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -18,7 +18,7 @@
__docformat__ = 'restructuredtext'
import zope.schema
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.configuration.exceptions import ConfigurationError
from zope.configuration.fields import GlobalObject
from zope.interface.interfaces import IInterface
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/viewmeta.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/viewmeta.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/viewmeta.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -17,8 +17,7 @@
"""
import os
-from zope.component.exceptions import ComponentLookupError
-from zope.component.interfaces import IDefaultViewName
+from zope.component.interfaces import ComponentLookupError, IDefaultViewName
from zope.interface import implements, classImplements, Interface
from zope.publisher.interfaces import NotFound
from zope.security.checker import CheckerPublic, Checker
Modified: Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_fieldfactory.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_fieldfactory.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_fieldfactory.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -20,8 +20,7 @@
import zope.app.schema
from zope.app import zapi
-from zope.component.exceptions import ComponentLookupError
-from zope.component.interfaces import IFactory
+from zope.component.interfaces import ComponentLookupError, IFactory
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.schema.interfaces import IField, IText
from zope.interface import Interface
Modified: Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_interfaceutility.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_interfaceutility.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/schema/tests/test_interfaceutility.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -19,7 +19,7 @@
from zope.interface import Interface, implements
from zope.interface.interface import InterfaceClass
from zope.interface.interfaces import IInterface
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.app import zapi
from zope.app.component.interfaces import ILocalUtility
Modified: Zope3/branches/jim-adapter/src/zope/app/schemacontent/browser/__init__.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schemacontent/browser/__init__.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/schemacontent/browser/__init__.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -24,7 +24,7 @@
from zope.app.form.interfaces import IInputWidget
from zope.app.schemacontent.interfaces import IContentComponentDefinition
from zope.app.schemacontent.content import ContentComponentInstance
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import implements
from zope.publisher.interfaces import IPublishTraverse
from zope.schema import getFieldsInOrder, Choice
Modified: Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/schemacontent/tests/test_content.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -17,7 +17,7 @@
"""
import unittest
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import Interface, classImplements
from zope.schema import Int, TextLine, Text
Modified: Zope3/branches/jim-adapter/src/zope/app/sqlexpr/sqlexpr.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/sqlexpr/sqlexpr.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/sqlexpr/sqlexpr.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -15,7 +15,7 @@
$Id$
"""
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import implements
from zope.tales.interfaces import ITALESExpression
from zope.tales.expressions import StringExpr
Modified: Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/traversing/namespace.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -21,7 +21,7 @@
import zope.component
import zope.interface
from zope.i18n.interfaces import IModifiableUserPreferredLanguages
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.interface import providedBy, directlyProvides, directlyProvidedBy
from zope.publisher.interfaces.browser import ISkin
from zope.security.proxy import removeSecurityProxy
Modified: Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/tree/adapters.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -21,7 +21,7 @@
$Id$
"""
from zope.interface import Interface, implements
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.security import canAccess
from zope.security.interfaces import Unauthorized
Modified: Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/app/tree/tests/test_adapters.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -18,7 +18,7 @@
import unittest
from zope.interface import implements, directlyProvides
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
from zope.security.checker import defineChecker
from zope.security.checker import NamesChecker
Modified: Zope3/branches/jim-adapter/src/zope/component/bbb/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/component/bbb/adapter.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/component/bbb/adapter.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -21,8 +21,8 @@
import warnings
from types import ClassType
-from zope.component.exceptions import ComponentLookupError
-from zope.component.interfaces import IAdapterService, IRegistry
+from zope.component.interfaces import IRegistry, ComponentLookupError
+from zope.component.bbb.interfaces import IAdapterService
from zope.component.bbb.service import GlobalService
from zope.component.components import AdapterRegistration, SubscriptionRegistration
from zope.interface import implements, providedBy, Interface, implementedBy
Modified: Zope3/branches/jim-adapter/src/zope/component/bbb/utility.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/component/bbb/utility.py 2006-03-01 06:27:58 UTC (rev 65662)
+++ Zope3/branches/jim-adapter/src/zope/component/bbb/utility.py 2006-03-01 06:29:47 UTC (rev 65663)
@@ -15,8 +15,8 @@
$Id$
"""
-from zope.component.exceptions import Invalid, ComponentLookupError
-from zope.component.interfaces import IUtilityService, IRegistry
+from zope.component.interfaces import Invalid, ComponentLookupError, IRegistry
+from zope.component.bbb.interfaces import IUtilityService
from zope.component.service import GlobalService, IService, IServiceDefinition
from zope.component.components import UtilityRegistration
import zope.interface
More information about the Zope3-Checkins
mailing list