[Zope3-checkins] CVS: Zope3/src/zope/app/registration - interfaces.py:1.7 registration.py:1.9

[Jim Fulton]

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

Modified Files:
	interfaces.py registration.py 
Log Message:
Renamed (I)RegistrationManagerContainer to (I)RegisterableContainer.


=== Zope3/src/zope/app/registration/interfaces.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/registration/interfaces.py:1.6	Sat Apr 17 10:33:26 2004
+++ Zope3/src/zope/app/registration/interfaces.py	Sat Apr 17 11:13:12 2004
@@ -304,7 +304,7 @@
     """Manage Registrations
     """
 
-class IRegistrationManagerContainer(IContainer):
+class IRegisterableContainer(IContainer):
     """Containers with registration managers
 
     These are site-management folders of one sort or another.
@@ -368,11 +368,11 @@
     """A marker interface."""
     
     __parent__ = Field(
-        constraint = ContainerTypesConstraint(IRegistrationManagerContainer))
+        constraint = ContainerTypesConstraint(IRegisterableContainer))
 
-IRegistrationManagerContainer['__setitem__'].setTaggedValue(
+IRegisterableContainer['__setitem__'].setTaggedValue(
     'precondition',
-    ItemTypePrecondition(IRegisterable, IRegistrationManagerContainer))
+    ItemTypePrecondition(IRegisterable, IRegisterableContainer))
     
 
 class IRegistered(Interface):


=== Zope3/src/zope/app/registration/registration.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/registration/registration.py:1.8	Sat Apr 17 10:33:30 2004
+++ Zope3/src/zope/app/registration/registration.py	Sat Apr 17 11:13:12 2004
@@ -835,16 +835,14 @@
         self._moveUpOrDown(names, 1)
 
 
-
-
-class RegistrationManagerContainer(object):
-    """Mix-in to implement IRegistrationManagerContainer
+class RegisterableContainer(object):
+    """Mix-in to implement IRegisterableContainer
     """
 
-    implements(interfaces.IRegistrationManagerContainer)
+    implements(interfaces.IRegisterableContainer)
 
     def __init__(self):
-        super(RegistrationManagerContainer, self).__init__()
+        super(RegisterableContainer, self).__init__()
         rm = RegistrationManager()
         rm.__parent__ = self
         rm.__name__ = 'RegistrationManager'
@@ -862,7 +860,7 @@
                    ) < 2:
                 raise interfaces.NoRegistrationManagerError(
                     "Can't delete the last registration manager")
-        super(RegistrationManagerContainer, self).__delitem__(name)
+        super(RegisterableContainer, self).__delitem__(name)
 
     def getRegistrationManager(self):
         """Get a registration manager
@@ -895,9 +893,9 @@
                 return manager.getModule()
 
 
-        # See if out container is a RegistrationManagerContainer:
+        # See if out container is a RegisterableContainer:
         c = self.__parent__
-        if interfaces.IRegistrationManagerContainer.providedBy(c):
+        if interfaces.IRegisterableContainer.providedBy(c):
             return c.findModule(name)
 
         # Use sys.modules in lieu of module service: