[Zope3-checkins] CVS: Zope3/src/zope/app/services - registration.py:1.28

[Jim Fulton]

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

Modified Files:
	registration.py 
Log Message:
Got rid of NameRegistry.


=== Zope3/src/zope/app/services/registration.py 1.27 => 1.28 ===
--- Zope3/src/zope/app/services/registration.py:1.27	Sat Mar  6 17:07:25 2004
+++ Zope3/src/zope/app/services/registration.py	Sat Mar  6 17:20:47 2004
@@ -438,14 +438,14 @@
             adapter.removeUsage(zapi.getPath(self))
 
 
-class NameRegistry:
-    """Mixin for implementing INameRegistry
+class NameComponentRegistry:
+    """Mixin for implementing INameComponentRegistry
     """
-    implements(interfaces.INameRegistry)
+    implements(interfaces.INameComponentRegistry)
 
     def __init__(self, *args, **kw):
         self._bindings = {}
-        super(NameRegistry, self).__init__(*args, **kw)
+        super(NameComponentRegistry, self).__init__(*args, **kw)
 
     def queryRegistrationsFor(self, cfg, default=None):
         """See IRegistry"""
@@ -473,12 +473,6 @@
         """See INameRegistry"""
         return filter(self._bindings.get,
                       self._bindings.keys())
-
-
-class NameComponentRegistry(NameRegistry):
-    """Mixin for implementing INameComponentRegistry
-    """
-    implements(interfaces.INameComponentRegistry)
 
     def queryActiveComponent(self, name, default=None):
         """See INameComponentRegistry"""