[Checkins] SVN: zope.app.container/trunk/ - Added undeclared install dependency on ``zope.app.publisher``.

Michael Howitz mh at gocept.com
Sat Dec 26 10:09:16 EST 2009


Log message for revision 107090:
  - Added undeclared install dependency on ``zope.app.publisher``.
  
  - Test no longer use deprecated ``zope.testing.doctestunit`` but
    python's ``doctest`` instead.
  
  

Changed:
  U   zope.app.container/trunk/CHANGES.txt
  U   zope.app.container/trunk/setup.py
  U   zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py
  U   zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py

-=-
Modified: zope.app.container/trunk/CHANGES.txt
===================================================================
--- zope.app.container/trunk/CHANGES.txt	2009-12-26 14:12:23 UTC (rev 107089)
+++ zope.app.container/trunk/CHANGES.txt	2009-12-26 15:09:15 UTC (rev 107090)
@@ -7,8 +7,15 @@
 
 - Fixed test_directive. Some parts of zope.app.publisher were moved
   to zope.browsermenu and zope.browserpage.
+
 - Moved tests/test_view_permissions.py to browser/tests.
 
+- Added undeclared install dependency on ``zope.app.publisher``.
+
+- Test no longer use deprecated ``zope.testing.doctestunit`` but
+  python's ``doctest`` instead.
+
+
 3.8.0 (2009-05-13)
 ------------------
 

Modified: zope.app.container/trunk/setup.py
===================================================================
--- zope.app.container/trunk/setup.py	2009-12-26 14:12:23 UTC (rev 107089)
+++ zope.app.container/trunk/setup.py	2009-12-26 15:09:15 UTC (rev 107090)
@@ -70,6 +70,7 @@
                         'zope.security',
                         'zope.size',
                         'zope.traversing',
+                        'zope.app.publisher',
                         ],
       include_package_data = True,
       zip_safe = False,

Modified: zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py	2009-12-26 14:12:23 UTC (rev 107089)
+++ zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py	2009-12-26 15:09:15 UTC (rev 107090)
@@ -15,6 +15,7 @@
 
 $Id$
 """
+import doctest
 import unittest
 
 import zope.interface
@@ -26,7 +27,6 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.browser import BrowserView
 from zope.security.interfaces import ForbiddenAttribute
-from zope.testing.doctestunit import DocTestSuite
 from zope.exceptions.interfaces import UserError
 from zope.traversing.api import getParent
 from zope.traversing.browser import AbsoluteURL
@@ -579,7 +579,7 @@
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocTestSuite(setUp=setUp, tearDown=tearDown),
+        doctest.DocTestSuite(setUp=setUp, tearDown=tearDown),
         ))
 
 if __name__=='__main__':

Modified: zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py	2009-12-26 14:12:23 UTC (rev 107089)
+++ zope.app.container/trunk/src/zope/app/container/browser/tests/test_directive.py	2009-12-26 15:09:15 UTC (rev 107090)
@@ -15,14 +15,14 @@
 
 $Id$
 """
-import re
-import pprint
 import cStringIO
-
+import doctest
+import pprint
+import re
 import unittest
+
 from zope.interface import Interface
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.testing.doctestunit import DocTestSuite
 from zope.app.container.browser.metaconfigure import containerViews
 
 atre = re.compile(' at [0-9a-fA-Fx]+')
@@ -30,7 +30,7 @@
 class Context(object):
     actions = ()
     info = ''
-    
+
     def action(self, discriminator, callable, args):
         self.actions += ((discriminator, callable, args), )
         self.info = 'info'
@@ -286,9 +286,4 @@
 
 
 def test_suite():
-    return unittest.TestSuite((
-        DocTestSuite(),
-        ))
-
-if __name__ == '__main__':
-    unittest.main()
+    return doctest.DocTestSuite()



More information about the checkins mailing list