[Zope-Checkins] CVS: Zope3/lib/python/Zope/Server - dual_mode_channel.py:1.1.2.8

Shane Hathaway shane@cvs.zope.org
Thu, 10 Jan 2002 17:29:03 -0500


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

Modified Files:
      Tag: Zope-3x-branch
	dual_mode_channel.py 
Log Message:
Fixed failed test.  testHTTPServer.py has a check to ensure that all opened
channels on the server end get closed at the end of the test, but since
select triggers are also channels, the check would fail if the select
trigger happened to be created in the middle of a test.  Now we just
make sure the select trigger exists before starting the test.


=== Zope3/lib/python/Zope/Server/dual_mode_channel.py 1.1.2.7 => 1.1.2.8 ===
 
 from medusa.thread import select_trigger
-from medusa.thread.select_trigger import trigger
 from Adjustments import default_adj
 
 
@@ -54,7 +53,7 @@
         else:
             t = select_trigger.the_trigger
             if t is None:
-                t = trigger()
+                t = select_trigger.trigger()
                 select_trigger.the_trigger = t
             t.pull_trigger()