Changeset 23:8697c567b678

Timestamp:

11/18/05 14:41:03 (3 years ago)

Author:

Allan Saddi <allan@saddi.com>

branch:

default

convert_revision:

svn:46762da8-4eb7-0310-94e9-d918b60927c8/flup/trunk@1826

Message:

When running under Python < 2.4, attempt to use socketpair()
from eunuchs module.

Files:

• ChangeLog (modified) (1 diff)
• flup/server/preforkserver.py (modified) (1 diff)

ChangeLog

@@ +1 @@
+2005-11-18  Allan Saddi  <asaddi@kalahari.flup.org>
+
+        * When running under Python < 2.4, attempt to use socketpair()
+          from eunuchs module.
+
-2005-09-07  Allan Saddi  <asaddi@europa.saddi.net>
-

flup/server/preforkserver.py

@@ -35 +35 @@
-import signal
-
+# If running Python < 2.4, require eunuchs module for socket.socketpair().
+# See <http://www.inoi.fi/open/trac/eunuchs>.
+if not hasattr(socket, 'socketpair'):
+    try:
+        import eunuchs
+    except ImportError:
+        # TODO: Other alternatives? Perhaps using os.pipe()?
+        raise ImportError, 'Requires eunuchs module for Python < 2.4'
+
+    def socketpair():
+        s1, s2 = eunuchs.socketpair.socketpair()
+        return (socket.fromfd(s1, socket.AF_UNIX, socket.SOCK_STREAM),
+                socket.fromfd(s2, socket.AF_UNIX, socket.SOCK_STREAM))
+
+    socket.socketpair = socketpair
+
-class PreforkServer(object):
-    """