[Zope-Checkins] CVS: Zope/ZServer - __init__.py:1.20

[Brian Lloyd]

Update of /cvs-repository/Zope/ZServer
In directory cvs.zope.org:/tmp/cvs-serv21943

Modified Files:
	__init__.py 
Log Message:
Merged asyncore / asynchat fixes from 2.5 branch.


=== Zope/ZServer/__init__.py 1.19 => 1.20 ===
 ##############################################################################
 
-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'