[Zope-CVS] CVS: Products/AdaptableStorage/mapper - ObjectMapper.py:1.3

Shane Hathaway shane@zope.com
Thu, 6 Feb 2003 14:09:22 -0500


Update of /cvs-repository/Products/AdaptableStorage/mapper
In directory cvs.zope.org:/tmp/cvs-serv3319/mapper

Modified Files:
	ObjectMapper.py 
Log Message:
Removed the volatile object mapper feature.  Setting the cache_size to 0
is simpler and faster, and although volatile mappers provide more
fine-grained control over caching, they don't seem to be needed for now.

To bring the feature back, do this:

cvs up -j without-volatile-mappers -j with-volatile-mappers



=== Products/AdaptableStorage/mapper/ObjectMapper.py 1.2 => 1.3 ===
--- Products/AdaptableStorage/mapper/ObjectMapper.py:1.2	Mon Jan  6 18:17:44 2003
+++ Products/AdaptableStorage/mapper/ObjectMapper.py	Thu Feb  6 14:08:50 2003
@@ -30,15 +30,13 @@
                  serializer=None,
                  gateway=None,
                  classifier=None,
-                 kgen=None,
-                 volatile=None):
+                 kgen=None):
         self._sub_mappers = {}
         self._parent = parent
         self._serializer = serializer
         self._gateway = gateway
         self._classifier = classifier
         self._kgen = kgen
-        self._volatile = volatile
 
     # IConfigurableObjectMapper implementation
 
@@ -54,9 +52,6 @@
     def setKeychainGenerator(self, k):
         self._kgen = k
 
-    def setVolatile(self, v):
-        self._volatile = v
-
     def addSubMapper(self, name, m=None, replace=0):
         if not replace and self._sub_mappers.has_key(name):
             raise KeyError('mapper name %s already in use' % name)
@@ -126,12 +121,5 @@
             return self._kgen
         if self._parent is not None:
             return self._parent.getKeychainGenerator()
-        return None
-
-    def isVolatile(self):
-        if self._volatile is not None:
-            return self._volatile
-        if self._parent is not None:
-            return self._parent.isVolatile()
         return None