[Zodb-checkins] CVS: ZODB3/ZEO - ClientStorage.py:1.75 StorageServer.py:1.76 __init__.py:1.13 simul.py:1.13 version.txt:1.4

[Guido van Rossum]

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

Modified Files:
	ClientStorage.py StorageServer.py __init__.py simul.py 
	version.txt 
Log Message:
Merge changes from release branch into trunk.

=== ZODB3/ZEO/ClientStorage.py 1.74 => 1.75 ===
--- ZODB3/ZEO/ClientStorage.py:1.74	Fri Oct  4 12:46:23 2002
+++ ZODB3/ZEO/ClientStorage.py	Fri Oct  4 20:35:25 2002
@@ -88,6 +88,8 @@
 # Singleton instance of DisconnectedServerStub
 disconnected_stub = DisconnectedServerStub()
 
+MB = 1024**2
+
 class ClientStorage:
 
     """A Storage class that is a network client to a remote storage.
@@ -105,7 +107,7 @@
     ConnectionManagerClass = ConnectionManager
     StorageServerStubClass = ServerStub.StorageServer
 
-    def __init__(self, addr, storage='1', cache_size=20000000,
+    def __init__(self, addr, storage='1', cache_size=20 * MB,
                  name='', client=None, debug=0, var=None,
                  min_disconnect_poll=5, max_disconnect_poll=300,
                  wait_for_server_on_startup=None, # deprecated alias for wait
@@ -120,15 +122,16 @@
         Arguments:
 
         addr -- The server address(es).  This is either a list of
-            addresses, or a single address.  Each address can be a
-            (hostname, port) tuple to signify a TCP/IP connection, or
+            addresses or a single address.  Each address can be a
+            (hostname, port) tuple to signify a TCP/IP connection or
             a pathname string to signify a Unix domain socket
             connection.  A hostname may be a DNS name or a dotted IP
             address.  Required.
 
-        storage -- The storage name, defaulting to '1'.  This must
+        storage -- The storage name, defaulting to '1'.  The name must
             match one of the storage names supported by the server(s)
-            specified by the addr argument.
+            specified by the addr argument.  The storage name is
+            displayed in the Zope control panel.
 
         cache_size -- The disk cache size, defaulting to 20 megabytes.
             This is passed to the ClientCache constructor.
@@ -137,16 +140,15 @@
             str(addr) is used as the storage name.
 
         client -- The client name, defaulting to None.  If this is
-            false, the environment value ZEO_CLIENT is used.  if the
+            false, the environment value ZEO_CLIENT is used.  If the
             effective value is true, the client cache is persistent.
             See ClientCache for more info.
 
         debug -- Ignored.  This is present only for backwards
             compatibility with ZEO 1.
 
-        var -- The 'var' directory, defaulting to None.  This is
-            passed to the ClientCache constructor, which picks a
-            default if the value is None.
+        var -- The 'var' directory, defaulting to None, in which
+            the persistent cache files should be written.
 
         min_disconnect_poll -- The minimum delay in seconds between
             attempts to connect to the server, in seconds.  Defaults


=== ZODB3/ZEO/StorageServer.py 1.75 => 1.76 ===
--- ZODB3/ZEO/StorageServer.py:1.75	Fri Oct  4 12:46:23 2002
+++ ZODB3/ZEO/StorageServer.py	Fri Oct  4 20:35:25 2002
@@ -43,7 +43,7 @@
     """Internal helper to reset the logging label (e.g. after fork())."""
     global _label
     _label = "ZSS:%s" % os.getpid()
-    
+
 def log(message, level=zLOG.INFO, label=None, error=None):
     """Internal helper to log a message using zLOG."""
     zLOG.LOG(label or _label, level, message, error=error)


=== ZODB3/ZEO/__init__.py 1.12 => 1.13 ===
--- ZODB3/ZEO/__init__.py:1.12	Tue Oct  1 12:15:33 2002
+++ ZODB3/ZEO/__init__.py	Fri Oct  4 20:35:25 2002
@@ -21,4 +21,4 @@
 
 """
 
-version = "2.0b1"
+version = "2.0b2"


=== ZODB3/ZEO/simul.py 1.12 => 1.13 ===
--- ZODB3/ZEO/simul.py:1.12	Tue Sep 17 12:12:46 2002
+++ ZODB3/ZEO/simul.py	Fri Oct  4 20:35:25 2002
@@ -18,7 +18,7 @@
 
 Use one of -b, -f, -l, -y or -z select the cache simulator:
 -b: buddy system allocator
--f: simple free list allocator 
+-f: simple free list allocator
 -l: idealized LRU (no allocator)
 -y: variation on the existing ZEO cache that copies to current file
 -z: existing ZEO cache (default)


=== ZODB3/ZEO/version.txt 1.3 => 1.4 ===
--- ZODB3/ZEO/version.txt:1.3	Mon Aug  5 15:09:54 2002
+++ ZODB3/ZEO/version.txt	Fri Oct  4 20:35:25 2002
@@ -1,2 +1,2 @@
-2.0b1
+2.0b2