Merged asyncore / asynchat fixes from 2.5 branch.

ZServer/__init__.py

@@ -11,10 +11,23 @@
 # 
 ##############################################################################
 
-import sys,os
-from medusa.test import max_sockets
+import sys, os
+
+# HACKERY to get around asyncore issues. This ought to go away! We're
+# currently using the Python 2.2 asyncore bundled with Zope to override
+# brokenness in the Python 2.1 version. We need to do some funny business
+# to make this work, as a 2.2-ism crept into the asyncore code.
+import fcntl, FCNTL
+if not hasattr(fcntl, 'F_GETFL'):
+    fcntl.F_GETFL = FCNTL.F_GETFL
+    fcntl.F_SETFL = FCNTL.F_SETFL
+    
+from medusa import asyncore
+sys.modules['asyncore'] = asyncore
 
 
+
+from medusa.test import max_sockets
 CONNECTION_LIMIT=max_sockets.max_select_sockets()
 
 ZSERVER_VERSION='1.1b1'

ZServer/medusa/asynchat.py

 # -*- Mode: Python; tab-width: 4 -*-
-#	$Id: asynchat.py,v 1.17 2001/05/01 11:44:48 andreas Exp $
+#       Id: asynchat.py,v 2.26 2000/09/07 22:29:26 rushing Exp
 #       Author: Sam Rushing <rushing@nightmare.com>
 
 # ======================================================================
@@ -25,7 +25,7 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 # ======================================================================
 
-"""A class supporting chat-style (command/response) protocols.
+r"""A class supporting chat-style (command/response) protocols.
 
 This class adds support for 'chat' style protocols - where one side
 sends a 'command', and the other sends a response (examples would be
@@ -48,7 +48,6 @@ you - by calling your self.found_terminator() method.
 
 import socket
 import asyncore
-import string
 
 class async_chat (asyncore.dispatcher):
     """This is an abstract class.  You must derive from this class, and add
@@ -120,7 +119,7 @@ class async_chat (asyncore.dispatcher):
                 # 3) end of buffer does not match any prefix:
                 #    collect data
                 terminator_len = len(terminator)
-                index = string.find (self.ac_in_buffer, terminator)
+                index = self.ac_in_buffer.find(terminator)
                 if index != -1:
                     # we found the terminator
                     if index > 0:
@@ -166,7 +165,7 @@ class async_chat (asyncore.dispatcher):
         # return len(self.ac_out_buffer) or len(self.producer_fifo) or (not self.connected)
         # this is about twice as fast, though not as clear.
         return not (
-                (self.ac_out_buffer is '') and
+                (self.ac_out_buffer == '') and
                 self.producer_fifo.is_empty() and
                 self.connected
                 )
@@ -270,23 +269,25 @@ class fifo:
         else:
             return (0, None)
 
-            # Given 'haystack', see if any prefix of 'needle' is at its end.  This
-            # assumes an exact match has already been checked.  Return the number of
-            # characters matched.
-            # for example:
-            # f_p_a_e ("qwerty\r", "\r\n") => 1
-            # f_p_a_e ("qwertydkjf", "\r\n") => 0
-            # f_p_a_e ("qwerty\r\n", "\r\n") => <undefined>
-            
-            # this could maybe be made faster with a computed regex?
-            # [answer: no; circa Python-2.0, Jan 2001]
-            # new python:   28961/s
-            # old python:   18307/s
-            # re:           12820/s
-            # regex:        14035/s
+# Given 'haystack', see if any prefix of 'needle' is at its end.  This
+# assumes an exact match has already been checked.  Return the number of
+# characters matched.
+# for example:
+# f_p_a_e ("qwerty\r", "\r\n") => 1
+# f_p_a_e ("qwerty\r\n", "\r\n") => 2
+# f_p_a_e ("qwertydkjf", "\r\n") => 0
+
+# this could maybe be made faster with a computed regex?
+# [answer: no; circa Python-2.0, Jan 2001]
+# python:    18307/s
+# re:        12820/s
+# regex:     14035/s
 
 def find_prefix_at_end (haystack, needle):
-    l = len(needle) - 1
-    while l and not haystack.endswith(needle[:l]):
-        l -= 1
-    return l
+    nl = len(needle)
+    result = 0
+    for i in range (1,nl):
+        if haystack[-(nl-i):] == needle[:(nl-i)]:
+            result = nl-i
+            break
+    return result

lib/python/ZServer/__init__.py

@@ -11,10 +11,23 @@
 # 
 ##############################################################################
 
-import sys,os
-from medusa.test import max_sockets
+import sys, os
+
+# HACKERY to get around asyncore issues. This ought to go away! We're
+# currently using the Python 2.2 asyncore bundled with Zope to override
+# brokenness in the Python 2.1 version. We need to do some funny business
+# to make this work, as a 2.2-ism crept into the asyncore code.
+import fcntl, FCNTL
+if not hasattr(fcntl, 'F_GETFL'):
+    fcntl.F_GETFL = FCNTL.F_GETFL
+    fcntl.F_SETFL = FCNTL.F_SETFL
+    
+from medusa import asyncore
+sys.modules['asyncore'] = asyncore
 
 
+
+from medusa.test import max_sockets
 CONNECTION_LIMIT=max_sockets.max_select_sockets()
 
 ZSERVER_VERSION='1.1b1'

lib/python/ZServer/medusa/asynchat.py

 # -*- Mode: Python; tab-width: 4 -*-
-#	$Id: asynchat.py,v 1.17 2001/05/01 11:44:48 andreas Exp $
+#       Id: asynchat.py,v 2.26 2000/09/07 22:29:26 rushing Exp
 #       Author: Sam Rushing <rushing@nightmare.com>
 
 # ======================================================================
@@ -25,7 +25,7 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 # ======================================================================
 
-"""A class supporting chat-style (command/response) protocols.
+r"""A class supporting chat-style (command/response) protocols.
 
 This class adds support for 'chat' style protocols - where one side
 sends a 'command', and the other sends a response (examples would be
@@ -48,7 +48,6 @@ you - by calling your self.found_terminator() method.
 
 import socket
 import asyncore
-import string
 
 class async_chat (asyncore.dispatcher):
     """This is an abstract class.  You must derive from this class, and add
@@ -120,7 +119,7 @@ class async_chat (asyncore.dispatcher):
                 # 3) end of buffer does not match any prefix:
                 #    collect data
                 terminator_len = len(terminator)
-                index = string.find (self.ac_in_buffer, terminator)
+                index = self.ac_in_buffer.find(terminator)
                 if index != -1:
                     # we found the terminator
                     if index > 0:
@@ -166,7 +165,7 @@ class async_chat (asyncore.dispatcher):
         # return len(self.ac_out_buffer) or len(self.producer_fifo) or (not self.connected)
         # this is about twice as fast, though not as clear.
         return not (
-                (self.ac_out_buffer is '') and
+                (self.ac_out_buffer == '') and
                 self.producer_fifo.is_empty() and
                 self.connected
                 )
@@ -270,23 +269,25 @@ class fifo:
         else:
             return (0, None)
 
-            # Given 'haystack', see if any prefix of 'needle' is at its end.  This
-            # assumes an exact match has already been checked.  Return the number of
-            # characters matched.
-            # for example:
-            # f_p_a_e ("qwerty\r", "\r\n") => 1
-            # f_p_a_e ("qwertydkjf", "\r\n") => 0
-            # f_p_a_e ("qwerty\r\n", "\r\n") => <undefined>
-            
-            # this could maybe be made faster with a computed regex?
-            # [answer: no; circa Python-2.0, Jan 2001]
-            # new python:   28961/s
-            # old python:   18307/s
-            # re:           12820/s
-            # regex:        14035/s
+# Given 'haystack', see if any prefix of 'needle' is at its end.  This
+# assumes an exact match has already been checked.  Return the number of
+# characters matched.
+# for example:
+# f_p_a_e ("qwerty\r", "\r\n") => 1
+# f_p_a_e ("qwerty\r\n", "\r\n") => 2
+# f_p_a_e ("qwertydkjf", "\r\n") => 0
+
+# this could maybe be made faster with a computed regex?
+# [answer: no; circa Python-2.0, Jan 2001]
+# python:    18307/s
+# re:        12820/s
+# regex:     14035/s
 
 def find_prefix_at_end (haystack, needle):
-    l = len(needle) - 1
-    while l and not haystack.endswith(needle[:l]):
-        l -= 1
-    return l
+    nl = len(needle)
+    result = 0
+    for i in range (1,nl):
+        if haystack[-(nl-i):] == needle[:(nl-i)]:
+            result = nl-i
+            break
+    return result