[Zodb-checkins] CVS: ZEO/ZEO/zrpc - connection.py:1.1.2.5 error.py:1.1.2.2 marshal.py:1.1.2.2 server.py:1.1.2.2 trigger.py:1.1.2.2

Tim Peters tim.one@home.com
Sat, 26 Jan 2002 13:03:52 -0500


Update of /cvs-repository/ZEO/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv28311/zrpc

Modified Files:
      Tag: Standby-branch
	connection.py error.py marshal.py server.py trigger.py 
Log Message:
Whitespace normalization.


=== ZEO/ZEO/zrpc/connection.py 1.1.2.4 => 1.1.2.5 ===
         msg = self.marshal.encode(msgid, 0, REPLY, ret)
         self.message_output(msg)
-    
+
     def return_error(self, msgid, flags, err_type, err_value):
         if flags is None:
             self.log_error("Exception raised during decoding")
@@ -271,7 +271,7 @@
                 if self.closed:
                     raise DisconnectedError()
         self.__reply_lock.release()
-            
+
     def _do_async_poll(self, wait_for_reply=0):
         "Invoke asyncore mainloop to get pending message out."
 
@@ -310,7 +310,7 @@
     """A connection that notifies its ConnectionManager of closing.
 
     A managed connection also defers the ThreadedAsync work to its
-    manager. 
+    manager.
     """
     __super_init = Connection.__init__
     __super_close = Connection.close
@@ -345,4 +345,3 @@
     def close(self):
         self.__super_close()
         self.__mgr.notify_closed(self)
-


=== ZEO/ZEO/zrpc/error.py 1.1.2.1 => 1.1.2.2 ===
 class DisconnectedError(ZRPCError, Disconnected):
     """The database storage is disconnected from the storage server."""
-


=== ZEO/ZEO/zrpc/marshal.py 1.1.2.1 => 1.1.2.2 ===
     # It's okay to share a single Pickler as long as it's in fast
     # mode, which means that it doesn't have a memo.
-    
+
     pickler = cPickle.Pickler()
     pickler.fast = 1
     pickle = pickler.dump
@@ -46,7 +46,7 @@
         r = getattr(m, name)
     except AttributeError:
         raise ZRPCError("module %s has no global %s" % (module, name))
-        
+
     safe = getattr(r, '__no_side_effects__', 0)
     if safe:
         return r


=== ZEO/ZEO/zrpc/server.py 1.1.2.1 => 1.1.2.2 ===
     reuse_addr = 1
 
-    def __init__(self, addr, factory=Connection, reuse_addr=None):  
+    def __init__(self, addr, factory=Connection, reuse_addr=None):
         self.__super_init()
         self.addr = addr
         self.factory = factory


=== ZEO/ZEO/zrpc/trigger.py 1.1.2.1 => 1.1.2.2 ===
-# 
+#
 # Zope Public License (ZPL) Version 1.0
 # -------------------------------------
-# 
+#
 # Copyright (c) Digital Creations.  All rights reserved.
-# 
+#
 # This license has been certified as Open Source(tm).
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
-# 
+#
 # 1. Redistributions in source code must retain the above copyright
 #    notice, this list of conditions, and the following disclaimer.
-# 
+#
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions, and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
-# 
+#
 # 3. Digital Creations requests that attribution be given to Zope
 #    in any manner possible. Zope includes a "Powered by Zope"
 #    button that is installed by default. While it is not a license
@@ -26,43 +26,43 @@
 #    attribution remain. A significant investment has been put
 #    into Zope, and this effort will continue if the Zope community
 #    continues to grow. This is one way to assure that growth.
-# 
+#
 # 4. All advertising materials and documentation mentioning
 #    features derived from or use of this software must display
 #    the following acknowledgement:
-# 
+#
 #      "This product includes software developed by Digital Creations
 #      for use in the Z Object Publishing Environment
 #      (http://www.zope.org/)."
-# 
+#
 #    In the event that the product being advertised includes an
 #    intact Zope distribution (with copyright and license included)
 #    then this clause is waived.
-# 
+#
 # 5. Names associated with Zope or Digital Creations must not be used to
 #    endorse or promote products derived from this software without
 #    prior written permission from Digital Creations.
-# 
+#
 # 6. Modified redistributions of any form whatsoever must retain
 #    the following acknowledgment:
-# 
+#
 #      "This product includes software developed by Digital Creations
 #      for use in the Z Object Publishing Environment
 #      (http://www.zope.org/)."
-# 
+#
 #    Intact (re-)distributions of any official Zope release do not
 #    require an external acknowledgement.
-# 
+#
 # 7. Modifications are encouraged but must be packaged separately as
 #    patches to official Zope releases.  Distributions that do not
 #    clearly separate the patches from the original work must be clearly
 #    labeled as unofficial distributions.  Modifications which do not
 #    carry the name Zope may be packaged in any form, as long as they
 #    conform to all of the clauses above.
-# 
-# 
+#
+#
 # Disclaimer
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
 #   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -75,12 +75,12 @@
 #   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
-# 
-# 
+#
+#
 # This software consists of contributions made by Digital Creations and
 # many individuals on behalf of Digital Creations.  Specific
 # attributions are listed in the accompanying credits file.
-# 
+#
 ##############################################################################
 
 # This module is a simplified version of the select_trigger module
@@ -94,7 +94,7 @@
 import socket
 import string
 import thread
-    
+
 if os.name == 'posix':
 
     class trigger (asyncore.file_dispatcher):
@@ -199,7 +199,7 @@
                     if port <= 19950:
                         raise 'Bind Error', 'Cannot bind trigger!'
                     port=port - 1
-            
+
             a.listen (1)
             w.setblocking (0)
             try:
@@ -250,7 +250,3 @@
                 self.thunks = []
             finally:
                 self.lock.release()
-
-
-
-