[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/services - configuration.py:1.7.2.2 query.py:1.8.6.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/interfaces/services
In directory cvs.zope.org:/tmp/cvs-serv21811/zope/app/interfaces/services

Modified Files:
      Tag: local-utility-branch
	configuration.py query.py 
Log Message:
checkpoint into branch

=== Zope3/src/zope/app/interfaces/services/configuration.py 1.7.2.1 => 1.7.2.2 ===
--- Zope3/src/zope/app/interfaces/services/configuration.py:1.7.2.1	Tue Mar 18 07:35:50 2003
+++ Zope3/src/zope/app/interfaces/services/configuration.py	Tue Mar 18 11:55:46 2003
@@ -67,7 +67,7 @@
         """Text for line 2 of configuration manager summary"""
 
 
-class INamedConfigurationInfo(Interface):
+class INamedConfiguration(IConfiguration):
     """Configuration object that is registered by name
     """
 
@@ -80,10 +80,7 @@
     label = Attribute("Descriptive label of the configuration type "
                       "(for example, Service, Connection)")
 
-class INamedConfiguration(INamedConfigurationInfo, IConfiguration):
-    pass
-
-class INamedComponentConfigurationInfo(INamedConfigurationInfo):
+class INamedComponentConfiguration(INamedConfiguration):
     """Configuration object that configures a component associated with a name
     """
 
@@ -97,8 +94,6 @@
         description=u"The physical path to the component",
         required=True)
 
-class INamedComponentConfiguration(INamedComponentConfigurationInfo,
-                                   INamedConfiguration):
     def getComponent():
         """Return the component named in the configuration.
         """


=== Zope3/src/zope/app/interfaces/services/query.py 1.8 => 1.8.6.1 ===
--- Zope3/src/zope/app/interfaces/services/query.py:1.8	Tue Feb 11 10:59:51 2003
+++ Zope3/src/zope/app/interfaces/services/query.py	Tue Mar 18 11:55:46 2003
@@ -18,7 +18,6 @@
 
 from zope.interface import Interface, Attribute
 from zope.app.security.permission import PermissionField
-from zope.app.interfaces.services.configuration import INamedConfigurationInfo
 from zope.app.interfaces.services.configuration import INamedConfiguration
 from zope.app.component.interfacefield import InterfacesField
 from zope.schema.interfaces import ITuple
@@ -76,7 +75,7 @@
 # The import is here to avoid circular imports
 from zope.app.services.queryfield import QueryProcessorsField
 
-class IQueryConfigurationInfo(INamedConfigurationInfo):
+class IQueryConfiguration(INamedConfiguration):
 
     permission = PermissionField(title=u'Required permission', required=False)
     inputInterfaces = InterfacesField(title=u'Input interfaces',
@@ -85,8 +84,6 @@
                                        basetype=None)
     processors = QueryProcessorsField(title=u'Query processors',
                                       required=False)
-
-class IQueryConfiguration(IQueryConfigurationInfo, INamedConfiguration):
 
     def getProcessors():
         'Returns a sequence of query processor objects.'