[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/services - registration.py:1.21 service.py:1.20

[Jim Fulton]

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

Modified Files:
	registration.py service.py 
Log Message:
Got rid of (unabstracted) NameComponentRegistry.


=== Zope3/src/zope/app/interfaces/services/registration.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/interfaces/services/registration.py:1.20	Sat Mar  6 17:20:47 2004
+++ Zope3/src/zope/app/interfaces/services/registration.py	Sun Mar  7 08:54:17 2004
@@ -275,42 +275,6 @@
         """
 
 
-
-class INameComponentRegistry(IRegistry):
-    """A name where the registrations refer to components.
-
-    All registrations that pass through queryRegistrationsFor and
-    createRegistrationsFor are expected to implement
-    INamedComponentRegistration.
-    """
-
-
-    def queryRegistrations(name, default=None):
-        """Return an IRegistrationRegistry for the registration name.
-
-        queryRegistrationsFor(cfg, default) is equivalent to
-        queryRegistrations(cfg.name, default)
-        """
-
-    def createRegistrationsFor(registration):
-        """Create and return an IRegistrationRegistry for the registration
-        name.
-
-        createRegistrationsFor(cfg, default) is equivalent to
-        createRegistrations(cfg.name, default)
-        """
-
-    def listRegistrationNames():
-        """Return a list of all registered registration names.
-        """
-
-
-    def queryActiveComponent(name, default=None):
-        """Finds the registration registry for a given name, checks if it has
-        an active registration, and if so, returns its component.  Otherwise
-        returns default.
-        """
-
 class IOrderedContainer(Interface):
     """Containers whose items can be reorderd.
 


=== Zope3/src/zope/app/interfaces/services/service.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/interfaces/services/service.py:1.19	Sat Mar  6 17:07:25 2004
+++ Zope3/src/zope/app/interfaces/services/service.py	Sun Mar  7 08:54:17 2004
@@ -94,7 +94,7 @@
 
 
 class ISiteManager(IServiceService, IComponentManager,
-                   registration.INameComponentRegistry):
+                   registration.IRegistry):
     """Service Managers act as containers for Services.
 
     If a Service Manager is asked for a service, it checks for those it
@@ -103,6 +103,32 @@
     to the ComponentArchitecture ServiceManager which contains file based
     services.
     """
+
+    def queryRegistrations(name, default=None):
+        """Return an IRegistrationRegistry for the registration name.
+
+        queryRegistrationsFor(cfg, default) is equivalent to
+        queryRegistrations(cfg.name, default)
+        """
+
+    def createRegistrationsFor(registration):
+        """Create and return an IRegistrationRegistry for the registration
+        name.
+
+        createRegistrationsFor(cfg, default) is equivalent to
+        createRegistrations(cfg.name, default)
+        """
+
+    def listRegistrationNames():
+        """Return a list of all registered registration names.
+        """
+
+
+    def queryActiveComponent(name, default=None):
+        """Finds the registration registry for a given name, checks if it has
+        an active registration, and if so, returns its component.  Otherwise
+        returns default.
+        """
 
     def queryLocalService(service_type, default=None):
         """Return a local service, if there is one