[Zope-Checkins] SVN: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/ Merged trunk r73189:73190 into 2.9 branch.

2007-04-09 Thread Stefan H. Holek 
Log message for revision 74043:
  Merged trunk r73189:73190 into 2.9 branch.
  
  Protect against setNumberOfThreads disappearing after first use.
  

Changed:
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
  U   Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py

-=-
Modified: Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
===
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-08 23:44:28 UTC (rev 74042)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-09 14:06:29 UTC (rev 74043)
@@ -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.9/lib/python/Testing/ZopeTestCase/utils.py
===
--- Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py  2007-04-08 
23:44:28 UTC (rev 74042)
+++ Zope/branches/2.9/lib/python/Testing/ZopeTestCase/utils.py  2007-04-09 
14:06:29 UTC (rev 74043)
@@ -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

[Zope-Checkins] SVN: Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/ Merged trunk r73189:73190 into 2.8 branch.

2007-04-09 Thread Stefan H. Holek 
Log message for revision 74045:
  Merged trunk r73189:73190 into 2.8 branch.
  
  Protect against setNumberOfThreads disappearing after first use.
  

Changed:
  U   
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
  U   Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py

-=-
Modified: 
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
===
--- 
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-09 14:20:09 UTC (rev 74044)
+++ 
Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/threadutils.py
2007-04-09 14:33:01 UTC (rev 74045)
@@ -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/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py
===
--- Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py  
2007-04-09 14:20:09 UTC (rev 74044)
+++ Zope/branches/Zope-2_8-branch/lib/python/Testing/ZopeTestCase/utils.py  
2007-04-09 14:33:01 UTC (rev 74045)
@@ -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

[Zope-Checkins] SVN: Products.Five/branches/1.5/ Merged trunk r74040:74041 into 1.5 branch.

2007-04-09 Thread Stefan H. Holek 
Log message for revision 74046:
  Merged trunk r74040:74041 into 1.5 branch.
  
  Fix test suites.
  

Changed:
  U   Products.Five/branches/1.5/formlib/tests/test_formlib.py
  U   Products.Five/branches/1.5/tests/test_registerpackage.py

-=-
Modified: Products.Five/branches/1.5/formlib/tests/test_formlib.py
===
--- Products.Five/branches/1.5/formlib/tests/test_formlib.py2007-04-09 
14:33:01 UTC (rev 74045)
+++ Products.Five/branches/1.5/formlib/tests/test_formlib.py2007-04-09 
14:45:53 UTC (rev 74046)
@@ -22,10 +22,10 @@
 def test_suite():
 import unittest
 from Testing.ZopeTestCase import FunctionalDocFileSuite
-return unittest.TestSuite(
+return unittest.TestSuite((
 FunctionalDocFileSuite(
-'formlib.txt', package='Products.Five.formlib.tests')
-)
+'formlib.txt', package='Products.Five.formlib.tests'),
+))
 
 if __name__ == '__main__':
 framework()

Modified: Products.Five/branches/1.5/tests/test_registerpackage.py
===
--- Products.Five/branches/1.5/tests/test_registerpackage.py2007-04-09 
14:33:01 UTC (rev 74045)
+++ Products.Five/branches/1.5/tests/test_registerpackage.py2007-04-09 
14:45:53 UTC (rev 74046)
@@ -77,10 +77,9 @@
 
 
 def test_suite():
-from zope.testing.doctest import DocTestSuite
-return DocTestSuite()
-#from Testing.ZopeTestCase import ZopeDocTestSuite
-#return ZopeDocTestSuite()
+# Must use functional because registerPackage commits
+from Testing.ZopeTestCase import FunctionalDocTestSuite
+return FunctionalDocTestSuite()
 
 if __name__ == '__main__':
 framework()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Products.Five/branches/1.4/formlib/tests/test_formlib.py Merged trunk r74040:74041 into 1.4 branch.

2007-04-09 Thread Stefan H. Holek 
Log message for revision 74048:
  Merged trunk r74040:74041 into 1.4 branch.
  
  Fix test suites.
  

Changed:
  U   Products.Five/branches/1.4/formlib/tests/test_formlib.py

-=-
Modified: Products.Five/branches/1.4/formlib/tests/test_formlib.py
===
--- Products.Five/branches/1.4/formlib/tests/test_formlib.py2007-04-09 
14:48:11 UTC (rev 74047)
+++ Products.Five/branches/1.4/formlib/tests/test_formlib.py2007-04-09 
14:51:29 UTC (rev 74048)
@@ -22,10 +22,10 @@
 def test_suite():
 import unittest
 from Testing.ZopeTestCase import FunctionalDocFileSuite
-return unittest.TestSuite(
+return unittest.TestSuite((
 FunctionalDocFileSuite(
-'formlib.txt', package='Products.Five.formlib.tests')
-)
+'formlib.txt', package='Products.Five.formlib.tests'),
+))
 
 if __name__ == '__main__':
 framework()

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Collector #2307: ObjectCopiedEvent not dispatched to sublocations.

2007-04-09 Thread Stefan H. Holek 
Log message for revision 74053:
  Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/OFS/subscribers.py
  U   Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py
  U   Zope/trunk/lib/python/Products/Five/event.zcml
  U   Zope/trunk/lib/python/Products/Five/tests/event.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2007-04-09 16:31:02 UTC (rev 74052)
+++ Zope/trunk/doc/CHANGES.txt  2007-04-09 16:38:09 UTC (rev 74053)
@@ -91,6 +91,8 @@
 
 Bugs Fixed
 
+  - Collector #2307: ObjectCopiedEvent not dispatched to sublocations.
+
   - Collector #2298: webdav.Resource.COPY and webdav.Resource.MOVE did
 not send the expected copy/move events.
 

Modified: Zope/trunk/lib/python/OFS/subscribers.py
===
--- Zope/trunk/lib/python/OFS/subscribers.py2007-04-09 16:31:02 UTC (rev 
74052)
+++ Zope/trunk/lib/python/OFS/subscribers.py2007-04-09 16:38:09 UTC (rev 
74053)
@@ -31,6 +31,7 @@
 import zope.location.interfaces
 from zope.app.container.contained import dispatchToSublocations
 from zope.app.container.interfaces import IObjectMovedEvent
+from zope.lifecycleevent.interfaces import IObjectCopiedEvent
 
 deprecatedManageAddDeleteClasses = []
 
@@ -130,7 +131,15 @@
 if OFS.interfaces.IObjectManager.providedBy(ob):
 dispatchToSublocations(ob, event)
 
[EMAIL PROTECTED](OFS.interfaces.IItem, IObjectCopiedEvent)
+def dispatchObjectCopiedEvent(ob, event):
+Multi-subscriber for IItem + IObjectCopiedEvent.
+
+# Dispatch to sublocations
+if OFS.interfaces.IObjectManager.providedBy(ob):
+dispatchToSublocations(ob, event)
 
+
 def callManageAfterAdd(ob, item, container):
 Compatibility subscriber for manage_afterAdd.
 

Modified: Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py
===
--- Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py2007-04-09 
16:31:02 UTC (rev 74052)
+++ Zope/trunk/lib/python/OFS/tests/testCopySupportEvents.py2007-04-09 
16:38:09 UTC (rev 74053)
@@ -275,7 +275,7 @@
 # Test clone
 self.subfolder.manage_clone(self.folder.myfolder, 'myfolder')
 self.assertEqual(eventlog.called(),
-[#('mydoc', 'ObjectCopiedEvent'),
+[('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectCopiedEvent'),
  ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
@@ -291,7 +291,7 @@
 cb = self.folder.manage_copyObjects(['myfolder'])
 self.subfolder.manage_pasteObjects(cb)
 self.assertEqual(eventlog.called(),
-[#('mydoc', 'ObjectCopiedEvent'),
+[('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectCopiedEvent'),
  ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),
@@ -333,7 +333,7 @@
 req.environ['HTTP_DESTINATION'] = '%s/subfolder/myfolder' % 
self.folder.absolute_url()
 self.folder.myfolder.COPY(req, req.RESPONSE)
 self.assertEqual(eventlog.called(),
-[#('mydoc', 'ObjectCopiedEvent'),
+[('mydoc', 'ObjectCopiedEvent'),
  ('myfolder', 'ObjectCopiedEvent'),
  ('mydoc', 'ObjectWillBeAddedEvent'),
  ('myfolder', 'ObjectWillBeAddedEvent'),

Modified: Zope/trunk/lib/python/Products/Five/event.zcml
===
--- Zope/trunk/lib/python/Products/Five/event.zcml  2007-04-09 16:31:02 UTC 
(rev 74052)
+++ Zope/trunk/lib/python/Products/Five/event.zcml  2007-04-09 16:38:09 UTC 
(rev 74053)
@@ -16,4 +16,7 @@
   !-- dispatch IObjectClonedEvent with top-down semantics --
   subscriber handler=OFS.subscribers.dispatchObjectClonedEvent /
 
+  !-- dispatch IObjectCopiedEvent with top-down semantics --
+  subscriber handler=OFS.subscribers.dispatchObjectCopiedEvent /
+
 /configure

Modified: Zope/trunk/lib/python/Products/Five/tests/event.txt
===
--- Zope/trunk/lib/python/Products/Five/tests/event.txt 2007-04-09 16:31:02 UTC 
(rev 74052)
+++ Zope/trunk/lib/python/Products/Five/tests/event.txt 2007-04-09 16:38:09 UTC 
(rev 74053)
@@ -57,6 +57,7 @@
 
from zope.component.interfaces import IObjectEvent, IRegistrationEvent
from zope.app.container.interfaces import IObjectMovedEvent
+   from zope.lifecycleevent.interfaces import IObjectCopiedEvent
from OFS.interfaces import IObjectWillBeMovedEvent
from OFS.interfaces import IObjectClonedEvent
from OFS.interfaces import IItem
@@ -64,6 +65,7 @@
   ... print event.__class__.__name__, object.getId()
def printObjectEventExceptSome(object, event):
   ...