Log message for revision 73192: Merged r73189:73190 from the trunk. Protect against setNumberOfThreads disappearing after first use.
Changed: U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/threadutils.py U Zope/branches/2.10/lib/python/Testing/ZopeTestCase/utils.py -=- Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/threadutils.py =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/threadutils.py 2007-03-15 13:44:26 UTC (rev 73191) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/threadutils.py 2007-03-15 14:20:14 UTC (rev 73192) @@ -13,7 +13,7 @@ """Parts of ZServer support are in this module so they can be imported more selectively. -$Id: threadutils.py,v 1.6 2004/08/19 15:31:26 shh42 Exp $ +$Id$ """ from threading import Thread @@ -22,6 +22,15 @@ dummyLOG = StringIO() +def setNumberOfThreads(number_of_threads): + '''Sets number of ZServer threads.''' + try: + from ZServer.PubCore import setNumberOfThreads + setNumberOfThreads(number_of_threads) + except ImportError: + pass + + def zserverRunner(host, port, log=None): '''Runs an HTTP ZServer on host:port.''' from ZServer import logger, asyncore Modified: Zope/branches/2.10/lib/python/Testing/ZopeTestCase/utils.py =================================================================== --- Zope/branches/2.10/lib/python/Testing/ZopeTestCase/utils.py 2007-03-15 13:44:26 UTC (rev 73191) +++ Zope/branches/2.10/lib/python/Testing/ZopeTestCase/utils.py 2007-03-15 14:20:14 UTC (rev 73192) @@ -115,7 +115,7 @@ if _Z2HOST is None: _Z2HOST = '127.0.0.1' _Z2PORT = random.choice(range(55000, 55500)) - from ZServer import setNumberOfThreads + from threadutils import setNumberOfThreads setNumberOfThreads(number_of_threads) from threadutils import QuietThread, zserverRunner t = QuietThread(target=zserverRunner, args=(_Z2HOST, _Z2PORT, log)) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins