[Zodb-checkins] CVS: ZODB3/ZEO - ClientCache.py:1.38.2.1 ClientStorage.py:1.73.2.4 util.py:1.3.10.1

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv32227

Modified Files:
      Tag: ZODB3-3_1-branch
	ClientCache.py ClientStorage.py util.py 
Log Message:
Merge docstring changes from trunk.

=== ZODB3/ZEO/ClientCache.py 1.38 => 1.38.2.1 ===
--- ZODB3/ZEO/ClientCache.py:1.38	Tue Oct  1 17:12:12 2002
+++ ZODB3/ZEO/ClientCache.py	Wed Oct 16 17:44:05 2002
@@ -98,8 +98,6 @@
 
 If var is not writable, then temporary files are used for
 file 0 and file 1.
-
-$Id$
 """
 
 import os


=== ZODB3/ZEO/ClientStorage.py 1.73.2.3 => 1.73.2.4 ===
--- ZODB3/ZEO/ClientStorage.py:1.73.2.3	Fri Oct  4 15:49:46 2002
+++ ZODB3/ZEO/ClientStorage.py	Wed Oct 16 17:44:05 2002
@@ -19,8 +19,6 @@
 ClientStorageError -- exception raised by ClientStorage
 UnrecognizedResult -- exception raised by ClientStorage
 ClientDisconnected -- exception raised by ClientStorage
-
-$Id$
 """
 
 # XXX TO DO


=== ZODB3/ZEO/util.py 1.3 => 1.3.10.1 ===
--- ZODB3/ZEO/util.py:1.3	Thu Aug 29 12:31:17 2002
+++ ZODB3/ZEO/util.py	Wed Oct 16 17:44:05 2002
@@ -26,6 +26,12 @@
     return d
 
 class Environment:
+    """Determine location of the Data.fs & ZEO_SERVER.pid files.
+
+    Pass the argv[0] used to start ZEO to the constructor.
+
+    Use the zeo_pid and fs attributes to get the filenames.
+    """
 
     def __init__(self, argv0):
         v = os.environ.get("INSTANCE_HOME")
@@ -45,6 +51,6 @@
         pid = os.environ.get("ZEO_SERVER_PID")
         if pid is None:
             pid = os.path.join(self.var, "ZEO_SERVER.pid")
-        self.zeo_pid = pid
 
+        self.zeo_pid = pid
         self.fs = os.path.join(self.var, "Data.fs")