[Zodb-checkins] SVN: ZODB/trunk/src/ZEO/zrpc/smac.py Revering 121290, I was too hasty. Tests were failing.

[Jim Fulton]

Log message for revision 121305:
  Revering 121290, I was too hasty. Tests were failing.

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

-=-
Modified: ZODB/trunk/src/ZEO/zrpc/smac.py
===================================================================
--- ZODB/trunk/src/ZEO/zrpc/smac.py	2011-04-06 12:34:16 UTC (rev 121304)
+++ ZODB/trunk/src/ZEO/zrpc/smac.py	2011-04-06 13:50:21 UTC (rev 121305)
@@ -266,15 +266,7 @@
             while (size <= SEND_SIZE) and messages:
                 message = messages[0]
                 if message.__class__ is str:
-                    if self.__hmac_send:
-                        size += self.__message_output(messages.pop(0), output)
-                    else:
-                        # inline common case
-                        lmessage = len(message)
-                        output.append(struct.pack(">I", lmessage))
-                        output.append(messages.pop())
-                        size += 4 + lmessage
-
+                    size += self.__message_output(messages.pop(0), output)
                 elif message is _close_marker:
                     del messages[:]
                     del output[:]