[Zope-Checkins] CVS: Zope/lib/python/ZODB - DemoStorage.py:1.18.10.1 FileStorage.py:1.135.6.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv17213/lib/python/ZODB

Modified Files:
      Tag: Zope-2_7-branch
	DemoStorage.py FileStorage.py 
Log Message:
Merge changes from HEAD since the release of Zope 2.7a1 into the Zope-2_7-branch in preparation for release of Zope 2.7b1.


=== Zope/lib/python/ZODB/DemoStorage.py 1.18 => 1.18.10.1 ===
--- Zope/lib/python/ZODB/DemoStorage.py:1.18	Tue Apr 22 14:11:44 2003
+++ Zope/lib/python/ZODB/DemoStorage.py	Mon Jul 21 12:37:18 2003
@@ -436,7 +436,7 @@
         self._lock_acquire()
         try:
 
-            stop=`apply(TimeStamp, time.gmtime(t)[:5]+(t%60,))`
+            stop=`TimeStamp(*time.gmtime(t)[:5]+(t%60,))`
             _data=self._data
 
             # Build indexes up to the pack time:


=== Zope/lib/python/ZODB/FileStorage.py 1.135 => 1.135.6.1 ===
--- Zope/lib/python/ZODB/FileStorage.py:1.135	Fri May 30 15:20:55 2003
+++ Zope/lib/python/ZODB/FileStorage.py	Mon Jul 21 12:37:18 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.