[Zope-Checkins] CVS: ZODB3/ZEO - DebugServer.py:1.1.20.1 ServerStub.py:1.16.8.1 StorageServer.py:1.98.6.1 __init__.py:1.19.6.1 monitor.py:1.3.20.1 zeopasswd.py:1.2.8.1

Tim Peters tim.one@comcast.net
Tue, 1 Jul 2003 16:57:41 -0400


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

Modified Files:
      Tag: zodb33-devel-branch
	DebugServer.py ServerStub.py StorageServer.py __init__.py 
	monitor.py zeopasswd.py 
Log Message:
Whitespace normalization.


=== ZODB3/ZEO/DebugServer.py 1.1 => 1.1.20.1 ===
--- ZODB3/ZEO/DebugServer.py:1.1	Wed Jan 15 16:26:53 2003
+++ ZODB3/ZEO/DebugServer.py	Tue Jul  1 16:57:08 2003
@@ -28,7 +28,7 @@
 ERROR = 4
 
 class DebugManagedServerConnection(ManagedServerConnection):
-    
+
     def __init__(self, sock, addr, obj, mgr):
         # mgr is the DebugServer instance
         self.mgr = mgr
@@ -67,7 +67,7 @@
 
     ZEOStorageClass = DebugZEOStorage
     ManagedServerConnectionClass = DebugManagerConnection
-    
+
     def __init__(self, *args, **kwargs):
         StorageServer.__init__(*args, **kwargs)
         self._setup_record(kwargs["record"])


=== ZODB3/ZEO/ServerStub.py 1.16 => 1.16.8.1 ===
--- ZODB3/ZEO/ServerStub.py:1.16	Fri May 30 15:20:57 2003
+++ ZODB3/ZEO/ServerStub.py	Tue Jul  1 16:57:08 2003
@@ -47,7 +47,7 @@
 
     def getAuthProtocol(self):
         return self.rpc.call('getAuthProtocol')
-    
+
     def lastTransaction(self):
         # Not in protocol version 2.0.0; see __init__()
         return self.rpc.call('lastTransaction')
@@ -150,6 +150,6 @@
     def __init__(self, rpc, name):
         self.rpc = rpc
         self.name = name
-        
+
     def call(self, *a, **kwa):
         return self.rpc.call(self.name, *a, **kwa)


=== ZODB3/ZEO/StorageServer.py 1.98 => 1.98.6.1 ===
--- ZODB3/ZEO/StorageServer.py:1.98	Fri Jun 13 15:50:05 2003
+++ ZODB3/ZEO/StorageServer.py	Tue Jul  1 16:57:08 2003
@@ -89,7 +89,7 @@
         self._extensions = {}
         for func in self.extensions:
             self._extensions[func.func_name] = None
-        
+
     def finish_auth(self, authenticated):
         if not self.auth_realm:
             return 1
@@ -98,7 +98,7 @@
 
     def set_database(self, database):
         self.database = database
-        
+
     def notifyConnected(self, conn):
         self.connection = conn # For restart_other() below
         self.client = self.ClientStorageStubClass(conn)
@@ -188,7 +188,7 @@
         if not protocol or protocol == 'none':
             return None
         return protocol
-    
+
     def register(self, storage_id, read_only):
         """Select the storage that this client will use
 
@@ -658,12 +658,12 @@
 
         auth_protocol -- The name of the authentication protocol to use.
             Examples are "digest" and "srp".
-            
+
         auth_filename -- The name of the password database filename.
             It should be in a format compatible with the authentication
             protocol used; for instance, "sha" and "srp" require different
             formats.
-            
+
             Note that to implement an authentication protocol, a server
             and client authentication mechanism must be implemented in a
             auth_* module, which should be stored inside the "auth"
@@ -711,7 +711,7 @@
             self.monitor = StatsServer(monitor_address, self.stats)
         else:
             self.monitor = None
-            
+
     def _setup_auth(self, protocol):
         # Can't be done in global scope, because of cyclic references
         from ZEO.auth import get_module
@@ -722,9 +722,9 @@
         if not module:
             log("%s: no such an auth protocol: %s" % (name, protocol))
             return
-        
+
         storage_class, client, db_class = module
-        
+
         if not storage_class or not issubclass(storage_class, ZEOStorage):
             log(("%s: %s isn't a valid protocol, must have a StorageClass" %
                  (name, protocol)))
@@ -733,7 +733,7 @@
         self.ZEOStorageClass = storage_class
 
         log("%s: using auth protocol: %s" % (name, protocol))
-        
+
         # We create a Database instance here for use with the authenticator
         # modules. Having one instance allows it to be shared between multiple
         # storages, avoiding the need to bloat each with a new authenticator
@@ -745,7 +745,7 @@
                              "does not match storage realm %r"
                              % (self.database.realm, self.auth_realm))
 
-        
+
     def new_connection(self, sock, addr):
         """Internal: factory to create a new connection.
 
@@ -759,7 +759,7 @@
             zstorage.set_database(self.database)
         else:
             zstorage = self.ZEOStorageClass(self, self.read_only)
-            
+
         c = self.ManagedServerConnectionClass(sock, addr, zstorage, self)
         log("new connection %s: %s" % (addr, `c`))
         return c
@@ -829,12 +829,12 @@
         if not self.invq:
             log("invq empty")
             return None, []
-        
+
         earliest_tid = self.invq[0][0]
         if earliest_tid > tid:
             log("tid to old for invq %s < %s" % (u64(tid), u64(earliest_tid)))
             return None, []
-        
+
         oids = {}
         for tid, L in self.invq:
             for key in L:


=== ZODB3/ZEO/__init__.py 1.19 => 1.19.6.1 ===
--- ZODB3/ZEO/__init__.py:1.19	Mon Jun 16 17:49:58 2003
+++ ZODB3/ZEO/__init__.py	Tue Jul  1 16:57:08 2003
@@ -15,7 +15,7 @@
 
 See the file README.txt in this directory for an overview.
 
-ZEO is now part of ZODB; ZODB's home on the web is 
+ZEO is now part of ZODB; ZODB's home on the web is
 
     http://www.zope.org/Wikis/ZODB
 


=== ZODB3/ZEO/monitor.py 1.3 => 1.3.20.1 ===
--- ZODB3/ZEO/monitor.py:1.3	Wed Jan 15 16:23:16 2003
+++ ZODB3/ZEO/monitor.py	Tue Jul  1 16:57:08 2003
@@ -54,7 +54,7 @@
             elif field == "Active transactions":
                 self.active_txns = int(value)
             elif field == "Commit lock held for":
-                # This assumes 
+                # This assumes
                 self.lock_time = time.time() - int(value)
             elif field == "Commits":
                 self.commits = int(value)
@@ -112,7 +112,7 @@
         n = self.socket.send(s)
         if n < len(s):
             self.buf.append(s[:n])
-            
+
         if self.closed and not self.buf:
             asyncore.dispatcher.close(self)
 


=== ZODB3/ZEO/zeopasswd.py 1.2 => 1.2.8.1 ===
--- ZODB3/ZEO/zeopasswd.py:1.2	Fri May 30 15:20:57 2003
+++ ZODB3/ZEO/zeopasswd.py	Tue Jul  1 16:57:08 2003
@@ -68,12 +68,12 @@
             username = args[0]
         else:
             username, password = args
-        
+
     return config.zeo, delete, username, password
 
 def main(args=None):
     options, delete, username, password = options(args)
-    p = options.authentication_protocol  
+    p = options.authentication_protocol
     if p is None:
         usage("ZEO configuration does not specify authentication-protocol")
     if p == "digest":