[Zope-Checkins] CVS: Zope/lib/python/Products/TemporaryFolder - TemporaryStorage.py:1.7 __init__.py:1.5

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/TemporaryFolder
In directory cvs.zope.org:/tmp/cvs-serv28230

Modified Files:
	TemporaryStorage.py __init__.py 
Log Message:
Merge from branch.


=== Zope/lib/python/Products/TemporaryFolder/TemporaryStorage.py 1.6 => 1.7 ===
         self._lock_acquire()
         try:
-            data, t = self._conflict_cache.get((oid, serial), marker)
+            data = self._conflict_cache.get((oid, serial), marker)
             if data is marker:
                 raise POSException.ConflictError, (oid, serial)
-            return data
+            else:
+                return data[0] # data here is actually (data, t)
         finally:
             self._lock_release()
             


=== Zope/lib/python/Products/TemporaryFolder/__init__.py 1.4 => 1.5 ===
 
 import ZODB # for testrunner to be happy
-import TemporaryFolder
 
 def initialize(context):
+    import TemporaryFolder
     context.registerClass(
         TemporaryFolder.MountedTemporaryFolder,
         permission=TemporaryFolder.ADD_TEMPORARY_FOLDER_PERM,