[Zope-Checkins] CVS: Zope/lib/python/ZServer - FCGIServer.py:1.22.8.2.14.1 FTPServer.py:1.26.8.4.10.1 HTTPServer.py:1.46.2.2.16.2 PCGIServer.py:1.26.8.3.14.1

[Sidnei da Silva]

Update of /cvs-repository/Zope/lib/python/ZServer
In directory cvs.zope.org:/tmp/cvs-serv24100/lib/python/ZServer

Modified Files:
      Tag: dc-large_file-branch
	FCGIServer.py FTPServer.py HTTPServer.py PCGIServer.py 
Log Message:
Move import inside methods so that the ZConfig overrides actually takes effect.


=== Zope/lib/python/ZServer/FCGIServer.py 1.22.8.2 => 1.22.8.2.14.1 ===
--- Zope/lib/python/ZServer/FCGIServer.py:1.22.8.2	Thu Jan  8 18:34:02 2004
+++ Zope/lib/python/ZServer/FCGIServer.py	Wed Nov  3 15:38:33 2004
@@ -32,7 +32,7 @@
 from medusa.counter import counter
 from medusa.http_server import compute_timezone_for_log
 
-from ZServer import CONNECTION_LIMIT, requestCloseOnExec
+from ZServer import requestCloseOnExec
 
 from PubCore import handle
 from PubCore.ZEvent import Wakeup
@@ -642,6 +642,7 @@
 
 
     def readable(self):
+        from ZServer import CONNECTION_LIMIT
         return len(asyncore.socket_map) < CONNECTION_LIMIT
 
 


=== Zope/lib/python/ZServer/FTPServer.py 1.26.8.4 => 1.26.8.4.10.1 ===
--- Zope/lib/python/ZServer/FTPServer.py:1.26.8.4	Sun Mar 28 06:11:48 2004
+++ Zope/lib/python/ZServer/FTPServer.py	Wed Nov  3 15:38:33 2004
@@ -72,7 +72,7 @@
 from FTPResponse import make_response
 from FTPRequest import FTPRequest
 
-from ZServer import CONNECTION_LIMIT, requestCloseOnExec
+from ZServer import requestCloseOnExec
 
 from cStringIO import StringIO
 import os
@@ -653,6 +653,7 @@
         self.ftp_channel_class (self, conn, addr, self.module)
 
     def readable(self):
+        from ZServer import CONNECTION_LIMIT
         return len(asyncore.socket_map) < CONNECTION_LIMIT
 
     def listen(self, num):


=== Zope/lib/python/ZServer/HTTPServer.py 1.46.2.2.16.1 => 1.46.2.2.16.2 ===
--- Zope/lib/python/ZServer/HTTPServer.py:1.46.2.2.16.1	Wed Nov  3 15:14:32 2004
+++ Zope/lib/python/ZServer/HTTPServer.py	Wed Nov  3 15:38:33 2004
@@ -52,8 +52,8 @@
 from medusa.default_handler import unquote
 from asyncore import compact_traceback, dispatcher
 
-from ZServer import CONNECTION_LIMIT, ZOPE_VERSION, ZSERVER_VERSION
-from ZServer import requestCloseOnExec, LARGE_FILE_THRESHOLD
+from ZServer import ZOPE_VERSION, ZSERVER_VERSION
+from ZServer import requestCloseOnExec
 from zLOG import LOG, register_subsystem, BLATHER, INFO, WARNING, ERROR
 import DebugLogger
 from medusa import logger
@@ -74,6 +74,7 @@
 
 class zhttp_collector:
     def __init__(self, handler, request, size):
+        from ZServer import LARGE_FILE_THRESHOLD
         self.handler = handler
         self.request = request
         if size > LARGE_FILE_THRESHOLD:
@@ -400,8 +401,9 @@
         requestCloseOnExec(self.socket)
 
     def readable(self):
+        from ZServer import CONNECTION_LIMIT
         return self.accepting and \
-                len(asyncore.socket_map) < CONNECTION_LIMIT
+               len(asyncore.socket_map) < CONNECTION_LIMIT
 
     def listen(self, num):
         # override asyncore limits for nt's listen queue size


=== Zope/lib/python/ZServer/PCGIServer.py 1.26.8.3 => 1.26.8.3.14.1 ===
--- Zope/lib/python/ZServer/PCGIServer.py:1.26.8.3	Thu Jan  8 18:34:02 2004
+++ Zope/lib/python/ZServer/PCGIServer.py	Wed Nov  3 15:38:33 2004
@@ -35,7 +35,7 @@
 from asyncore import compact_traceback
 
 import ZServer
-from ZServer import CONNECTION_LIMIT, requestCloseOnExec
+from ZServer import requestCloseOnExec
 
 from PubCore import handle
 from PubCore.ZEvent import Wakeup
@@ -327,6 +327,7 @@
         self.channel_class(self, conn, addr)
 
     def readable(self):
+        from ZServer import CONNECTION_LIMIT
         return len(asyncore.socket_map) < CONNECTION_LIMIT
 
     def writable (self):