[Zope3-checkins] CVS: Zope3/src/zope/app/component - configure.zcml:1.3.24.1 globalinterfaceservice.py:1.8.8.1 interfacefield.py:1.7.12.1
Albertas Agejevas
alga@codeworks.lt
Tue, 13 May 2003 13:42:05 -0400
Update of /cvs-repository/Zope3/src/zope/app/component
In directory cvs.zope.org:/tmp/cvs-serv17129/src/zope/app/component
Modified Files:
Tag: stevea-decorators-branch
configure.zcml globalinterfaceservice.py interfacefield.py
Log Message:
Merged in zope.app.interfaces.component refactoring from trunk.
=== Zope3/src/zope/app/component/configure.zcml 1.3 => 1.3.24.1 ===
--- Zope3/src/zope/app/component/configure.zcml:1.3 Mon Dec 30 13:43:05 2002
+++ Zope3/src/zope/app/component/configure.zcml Tue May 13 13:41:35 2003
@@ -47,7 +47,7 @@
<serviceType
id='Interfaces'
- interface='zope.app.component.globalinterfaceservice.IInterfaceService' />
+ interface='zope.app.interfaces.component.IInterfaceService' />
<service
serviceType='Interfaces'
=== Zope3/src/zope/app/component/globalinterfaceservice.py 1.8 => 1.8.8.1 ===
--- Zope3/src/zope/app/component/globalinterfaceservice.py:1.8 Thu May 1 15:35:07 2003
+++ Zope3/src/zope/app/component/globalinterfaceservice.py Tue May 13 13:41:35 2003
@@ -16,10 +16,7 @@
"""
from zope.component.exceptions import ComponentLookupError
-# XXX some modules still import IInterfaceService here
-from zope.app.interfaces.component.interfaceservice import IInterfaceService
-from zope.app.interfaces.component.globalinterfaceservice \
- import IGlobalInterfaceService
+from zope.app.interfaces.component import IGlobalInterfaceService
class InterfaceService:
__implements__ = IGlobalInterfaceService
=== Zope3/src/zope/app/component/interfacefield.py 1.7 => 1.7.12.1 ===
--- Zope3/src/zope/app/component/interfacefield.py:1.7 Mon Apr 14 14:21:35 2003
+++ Zope3/src/zope/app/component/interfacefield.py Tue May 13 13:41:35 2003
@@ -19,8 +19,7 @@
from zope.interface import Interface
from zope.interface.interfaces import IInterface
from zope.schema.interfaces import ValidationError
-from zope.app.interfaces.component.interfacefield import IInterfaceField
-from zope.app.interfaces.component.interfacefield import IInterfacesField
+from zope.app.interfaces.component import IInterfaceField, IInterfacesField
class InterfaceField(Enumerated, Field):
__doc__ = IInterfaceField.__doc__