[Zodb-checkins] CVS: Zope/lib/python/ZEO - ClientStorage.py:1.106.4.1 runzeo.py:1.15.6.1

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_7-branch
	ClientStorage.py runzeo.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/ZEO/ClientStorage.py 1.106 => 1.106.4.1 ===
--- Zope/lib/python/ZEO/ClientStorage.py:1.106	Mon Jun 16 13:17:42 2003
+++ Zope/lib/python/ZEO/ClientStorage.py	Mon Jul 21 12:37:12 2003
@@ -56,7 +56,7 @@
     the argument.
     """
     t = time.time()
-    t = apply(TimeStamp, (time.gmtime(t)[:5] + (t % 60,)))
+    t = TimeStamp(*time.gmtime(t)[:5] + (t % 60,))
     if prev_ts is not None:
         t = t.laterThan(prev_ts)
     return t


=== Zope/lib/python/ZEO/runzeo.py 1.15 => 1.15.6.1 ===
--- Zope/lib/python/ZEO/runzeo.py:1.15	Fri May 30 15:20:57 2003
+++ Zope/lib/python/ZEO/runzeo.py	Mon Jul 21 12:37:12 2003
@@ -196,7 +196,7 @@
             transaction_timeout=self.options.transaction_timeout,
             monitor_address=self.options.monitor_address,
             auth_protocol=self.options.auth_protocol,
-            auth_database=self.options.auth_database,
+            auth_filename=self.options.auth_database,  # XXX option spelling
             auth_realm=self.options.auth_realm)
 
     def loop_forever(self):