[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server - Adjustments.py:1.1.2.4.2.2 DualModeChannel.py:1.1.2.4.2.2

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope/Server
In directory cvs.zope.org:/tmp/cvs-serv20611

Modified Files:
      Tag: Zope3-Server-Branch
	Adjustments.py DualModeChannel.py 
Log Message:
Okay, I just added rename functionality to the server, which means that the
new version of the FTP server handles now more commands than the old one!


=== Zope3/lib/python/Zope/Server/Adjustments.py 1.1.2.4.2.1 => 1.1.2.4.2.2 ===
 # FOR A PARTICULAR PURPOSE.
 
-from medusa.test import max_sockets
+from tests import MaxSockets
 
 
 class Adjustments:
@@ -33,7 +33,7 @@
     inbuf_overflow = 525000
 
     # Stop accepting new connections if too many are already active.
-    connection_limit = max_sockets.max_select_sockets() - 3  # Safe
+    connection_limit = MaxSockets.max_select_sockets() - 3  # Safe
 
     # Minimum seconds between cleaning up inactive channels.
     cleanup_interval = 300


=== Zope3/lib/python/Zope/Server/DualModeChannel.py 1.1.2.4.2.1 => 1.1.2.4.2.2 ===
 from UserDict import UserDict
 
-from medusa.thread import select_trigger
+from Thread import SelectTrigger
 from Adjustments import default_adj
 from Buffers import OverflowableBuffer
 
 
 # Create the main trigger if it doesn't exist yet.
-if select_trigger.the_trigger is None:
-    select_trigger.the_trigger = select_trigger.trigger()
+if SelectTrigger.the_trigger is None:
+    SelectTrigger.the_trigger = SelectTrigger.Trigger()
 
 
 class AlternateSocketMapMixin:
@@ -53,17 +53,17 @@
             # Use the trigger from the socket map.
             pull_trigger()
         else:
-            select_trigger.the_trigger.pull_trigger()
+            SelectTrigger.the_trigger.pull_trigger()
 
 
-class ASMTrigger(AlternateSocketMapMixin, select_trigger.trigger):
+class ASMTrigger(AlternateSocketMapMixin, SelectTrigger.Trigger):
     """Trigger for an alternate socket map"""
 
     def __init__(self, socket_map):
         self.socket_map = socket_map
         select_trigger.trigger.__init__(self)
 
-    pull_trigger = select_trigger.trigger.pull_trigger
+    pull_trigger = SelectTrigger.Trigger.pull_trigger
 
 
 class SocketMapWithTrigger(UserDict):