[Zodb-checkins] SVN: ZODB/trunk/src/ZEO/zrpc/smac.py Got rid of some debugging code that didn't actually do anything.

Jim Fulton jim at zope.com
Fri Dec 18 14:54:35 EST 2009


Log message for revision 106765:
  Got rid of some debugging code that didn't actually do anything.
  
  Cleaned up trailing whitespace.
  

Changed:
  U   ZODB/trunk/src/ZEO/zrpc/smac.py

-=-
Modified: ZODB/trunk/src/ZEO/zrpc/smac.py
===================================================================
--- ZODB/trunk/src/ZEO/zrpc/smac.py	2009-12-18 19:54:33 UTC (rev 106764)
+++ ZODB/trunk/src/ZEO/zrpc/smac.py	2009-12-18 19:54:35 UTC (rev 106765)
@@ -75,12 +75,8 @@
 
     socket = None # to outwit Sam's getattr
 
-    def __init__(self, sock, addr, map=None, debug=None):
+    def __init__(self, sock, addr, map=None):
         self.addr = addr
-        if debug is not None:
-            self._debug = debug
-        elif not hasattr(self, '_debug'):
-            self._debug = __debug__
         # __input_lock protects __inp, __input_len, __state, __msg_size
         self.__input_lock = threading.Lock()
         self.__inp = None # None, a single String, or a list
@@ -150,7 +146,7 @@
                 yield ''
 
         self.message_output(hack())
-        
+
     def get_addr(self):
         return self.addr
 
@@ -309,7 +305,7 @@
                 if err[0] in expected_socket_write_errors:
                     break # we couldn't write anything
                 raise
-            
+
             if n < l:
                 output.insert(0, v[n:])
                 break # we can't write any more
@@ -325,7 +321,7 @@
 
     def __message_output(self, message, output):
         # do two separate appends to avoid copying the message string
-        size = 4        
+        size = 4
         if self.__hmac_send:
             output.append(struct.pack(">I", len(message) | MAC_BIT))
             self.__hmac_send.update(message)



More information about the Zodb-checkins mailing list