[Zope3-checkins] CVS: Zope3/src/zope/app/container - configure.zcml:1.1.2.3 dependency.py:1.1.2.2 find.py:1.1.2.3 sample.py:1.1.2.2 zopecontainer.py:1.1.2.3

Jim Fulton jim@zope.com
Tue, 24 Dec 2002 07:52:00 -0500


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

Modified Files:
      Tag: NameGeddon-branch
	configure.zcml dependency.py find.py sample.py 
	zopecontainer.py 
Log Message:
Searched for and changed over 1200 references to Zope.something.

Most of these were either comments, doc strings, or permission ids.

Many were imports or ids in zcml.  (much zcml fixup is still needed.



=== Zope3/src/zope/app/container/configure.zcml 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/container/configure.zcml:1.1.2.2	Mon Dec 23 17:49:30 2002
+++ Zope3/src/zope/app/container/configure.zcml	Tue Dec 24 07:50:59 2002
@@ -3,7 +3,7 @@
   <adapter 
      provides="zope.app.interfaces.container.find.IFind"
      for="zope.app.interfaces.container.IReadContainer"
-     permission="Zope.ManageContent" 
+     permission="zope.ManageContent" 
      factory="zope.app.container.find.FindAdapter" />
  
   <include package=".Views" />
@@ -49,7 +49,7 @@
 
   <event:subscribe 
       subscriber = ".DependencyChecker.CheckDependency"
-      event_types = "Zope.App.Event.IObjectEvent.IObjectRemovedEvent"
+      event_types = "zope.app.interfaces.event.IObjectRemovedEvent"
       />
 
 


=== Zope3/src/zope/app/container/dependency.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/container/dependency.py:1.1.2.1	Mon Dec 23 14:31:27 2002
+++ Zope3/src/zope/app/container/dependency.py	Tue Dec 24 07:50:59 2002
@@ -20,7 +20,7 @@
 from zope.app.interfaces.dependable import DependencyError
 from zope.interfaces.event import ISubscriber
 from zope.proxy.introspection import removeAllProxies
-from Zope.App.Traversing import getPhysicalPathString, locationAsUnicode
+from zope.app.traversing import getPhysicalPathString, locationAsUnicode
 
 class DependencyChecker:
     """Checking dependency  while deleting object


=== Zope3/src/zope/app/container/find.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/container/find.py:1.1.2.2	Mon Dec 23 18:52:32 2002
+++ Zope3/src/zope/app/container/find.py	Tue Dec 24 07:50:59 2002
@@ -30,13 +30,9 @@
     
     def __init__(self, context):
         self._context = context
-        
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.Container.Find.IFind.IFind
 
     def find(self, id_filters=None, object_filters=None):
-        'See Zope.App.OFS.Container.Find.IFind.IFind'
+        'See IFind'
         id_filters = id_filters or []
         object_filters = object_filters or []
         result = []
@@ -79,15 +75,8 @@
 
     def __init__(self, ids):
         self._ids = ids
-        
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.Container.Find.IFind.INameFindFilter
 
     def matches(self, id):
-        'See Zope.App.OFS.Container.Find.IFind.INameFindFilter'
+        'See INameFindFilter'
         return id in self._ids
-
-    #
-    ############################################################
 


=== Zope3/src/zope/app/container/sample.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/container/sample.py:1.1.2.1	Mon Dec 23 14:31:27 2002
+++ Zope3/src/zope/app/container/sample.py	Tue Dec 24 07:50:59 2002
@@ -50,9 +50,6 @@
         """
         return {}
 
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.Container.IContainer
 
     def keys(self):
         '''See interface IReadContainer'''


=== Zope3/src/zope/app/container/zopecontainer.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/container/zopecontainer.py:1.1.2.2	Mon Dec 23 18:52:32 2002
+++ Zope3/src/zope/app/container/zopecontainer.py	Tue Dec 24 07:50:59 2002
@@ -40,12 +40,12 @@
         self.context = container
         
     def __getitem__(self, key):
-        "See Zope.App.OFS.Container.IZopeContainer.IZopeItemContainer"
+        "See IZopeItemContainer"
         value = self.context[key]
         return ContextWrapper(value, self.context, name=key)
 
     def get(self, key, default=None):
-        "See Zope.App.OFS.Container.IZopeContainer.IZopeSimpleReadContainer"
+        "See IZopeSimpleReadContainer"
         value = self.context.get(key, _marker)
         if value is not _marker:
             return ContextWrapper(value, self.context, name=key)
@@ -58,7 +58,7 @@
             
 
     def values(self):
-        "See Zope.App.OFS.Container.IZopeContainer.IZopeReadContainer"
+        "See IZopeReadContainer"
         container = self.context
         result = []
         for key, value in container.items():
@@ -74,7 +74,7 @@
         return len(self.context)    
 
     def items(self):
-        "See Zope.App.OFS.Container.IZopeContainer.IZopeReadContainer"
+        "See IZopeReadContainer"
         container = self.context
         result = []
         for key, value in container.items():
@@ -83,7 +83,7 @@
         
 
     def setObject(self, key, object):
-        "See Zope.App.OFS.Container.IZopeContainer.IZopeWriteContainer"
+        "See IZopeWriteContainer"
 
         if not isinstance(key, StringTypes):
             raise TypeError("Item name is not a string.")
@@ -118,7 +118,7 @@
         return key
 
     def __delitem__(self, key):
-        "See Zope.App.OFS.Container.IZopeContainer.IZopeWriteContainer"
+        "See IZopeWriteContainer"
         container = self.context
         
         object = container[key]