[Zope-Checkins] CVS: ZODB3/ZODB - FileStorage.py:1.135.4.1

Jeremy Hylton jeremy at zope.com
Wed Sep 3 17:06:04 EDT 2003


Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv5638

Modified Files:
      Tag: ZODB3-3_2-branch
	FileStorage.py 
Log Message:
Port from Zope-2_7-branch: Remove use of apply().


=== ZODB3/ZODB/FileStorage.py 1.135 => 1.135.4.1 ===
--- ZODB3/ZODB/FileStorage.py:1.135	Fri May 30 15:20:55 2003
+++ ZODB3/ZODB/FileStorage.py	Wed Sep  3 16:06:02 2003
@@ -293,7 +293,7 @@
 
         self._ts = tid = TimeStamp(tid)
         t = time.time()
-        t = apply(TimeStamp, (time.gmtime(t)[:5] + (t % 60,)))
+        t = TimeStamp(*time.gmtime(t)[:5] + (t % 60,))
         if tid > t:
             warn("%s Database records in the future", file_name);
             if tid.timeTime() - t.timeTime() > 86400*30:
@@ -1460,7 +1460,7 @@
         if self._is_read_only:
             raise POSException.ReadOnlyError()
         
-        stop=`apply(TimeStamp, time.gmtime(t)[:5]+(t%60,))`
+        stop=`TimeStamp(*time.gmtime(t)[:5]+(t%60,))`
         if stop==z64: raise FileStorageError, 'Invalid pack time'
 
         # If the storage is empty, there's nothing to do.




More information about the Zope-Checkins mailing list