[Zope3-checkins] CVS: Zope3/src/zope/app/cache - annotationcacheable.py:1.1.2.2 configure.zcml:1.1.2.2 ram.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	annotationcacheable.py configure.zcml ram.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/cache/annotationcacheable.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/cache/annotationcacheable.py:1.1.2.1	Mon Dec 23 14:31:24 2002
+++ Zope3/src/zope/app/cache/annotationcacheable.py	Tue Dec 24 07:50:57 2002
@@ -17,7 +17,7 @@
 from zope.app.interfaces.annotation import IAnnotations
 from zope.app.interfaces.cache.cache import ICacheable
 
-annotation_key = 'Zope.App.Caching.CacheManager'
+annotation_key = 'zope.app.cache.CacheManager'
 
 class AnnotationCacheable:
     """Stores cache information in object's annotations."""
@@ -28,12 +28,10 @@
         self._context = context
 
     def getCacheId(self):
-        """See Zope.App.Caching.ICacheable"""
         annotations = getAdapter(self._context, IAnnotations)
         return annotations.get(annotation_key, None)
 
     def setCacheId(self, id):
-        """See Zope.App.Caching.ICacheable"""
         # Remove object from old cache
         old_cache_id = self.getCacheId()
         if old_cache_id and old_cache_id != id:


=== Zope3/src/zope/app/cache/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/cache/configure.zcml:1.1.2.1	Mon Dec 23 14:31:24 2002
+++ Zope3/src/zope/app/cache/configure.zcml	Tue Dec 24 07:50:57 2002
@@ -1,7 +1,7 @@
 <zopeConfigure
    xmlns='http://namespaces.zope.org/zope'
    xmlns:browser='http://namespaces.zope.org/browser'
-   package="Zope.App.Caching"
+   package="zope.app.cache"
 >
 
   <serviceType id="Caching" interface="zope.app.interfaces.cache.cache.ICachingService" />
@@ -23,9 +23,9 @@
 >
 
   <content class="zope.app.cache.ram.RAMCache">
-    <factory id="RAMCache"
-        permission="Zope.Public" />
-    <require permission="Zope.Public" 
+    <factory id="zope.app.caching.RAMCache"
+        permission="zope.Public" />
+    <require permission="zope.Public" 
         interface="zope.app.interfaces.cache.ram.IRAMCache" />
     <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
   </content>


=== Zope3/src/zope/app/cache/ram.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/cache/ram.py:1.1.2.1	Mon Dec 23 14:31:24 2002
+++ Zope3/src/zope/app/cache/ram.py	Tue Dec 24 07:50:57 2002
@@ -76,12 +76,10 @@
         self.cleanupInterval = 300
 
     def getStatistics(self):
-        "See Zope.App.Caching.RAMCache.IRAMCache.IRAMCache"
         s = self._getStorage()
         return s.getStatistics()
 
     def update(self,  maxEntries=None, maxAge=None, cleanupInterval=None):
-        "See Zope.App.Caching.RAMCache.IRAMCache.IRAMCache"
 
         if maxEntries is not None:
             self.maxEntries = maxEntries
@@ -96,7 +94,6 @@
 
 
     def invalidate(self, ob, key=None):
-        "See Zope.App.Caching.ICache.ICache"
         s = self._getStorage()
         if key:
             key =  self._buildKey(key)
@@ -106,13 +103,11 @@
 
 
     def invalidateAll(self):
-        "See Zope.App.Caching.ICache.ICache"
         s = self._getStorage()
         s.invalidateAll()
 
 
     def query(self, ob, key=None, default=None):
-        "See Zope.App.Caching.ICache.ICache"
         s = self._getStorage()
         key = self._buildKey(key)
         try:
@@ -121,7 +116,6 @@
             return default
 
     def set(self, data, ob, key=None):
-        "See Zope.App.Caching.ICache.ICache"
         s = self._getStorage()
         key = self._buildKey(key)
         s.setEntry(ob, key, data)
@@ -154,7 +148,7 @@
     _buildKey = staticmethod(_buildKey)
 
     def notify(self, event):
-        """See Zope.Event.ISubscriber
+        """See ISubscriber
 
         This method receives ObjectModified events and invalidates
         cached entries for the objects that raise them.
@@ -351,7 +345,7 @@
         return self._data[object].keys()
 
     def getStatistics(self):
-        "Basically see Zope.App.Caching.RAMCache.IRAMCache"
+        "Basically see IRAMCache"
         objects = self._data.keys()
         objects.sort()
         result = []