[Checkins] SVN: zope.container/trunk/ Prefer the standard libraries doctest module to the one from zope.testing.
Hanno Schlichting
hannosch at hannosch.eu
Fri Apr 30 16:43:10 EDT 2010
Log message for revision 111713:
Prefer the standard libraries doctest module to the one from zope.testing.
Changed:
U zope.container/trunk/CHANGES.txt
U zope.container/trunk/src/zope/container/tests/test_btree.py
U zope.container/trunk/src/zope/container/tests/test_constraints.py
U zope.container/trunk/src/zope/container/tests/test_contained.py
U zope.container/trunk/src/zope/container/tests/test_directory.py
U zope.container/trunk/src/zope/container/tests/test_ordered.py
-=-
Modified: zope.container/trunk/CHANGES.txt
===================================================================
--- zope.container/trunk/CHANGES.txt 2010-04-30 20:39:57 UTC (rev 111712)
+++ zope.container/trunk/CHANGES.txt 2010-04-30 20:43:09 UTC (rev 111713)
@@ -5,13 +5,15 @@
3.11.1 (unreleased)
-------------------
+- Prefer the standard libraries doctest module to the one from zope.testing.
+
- Added compatibility with ZODB3 3.10 by importing the IBroken interface from
it directly. Once we can rely on the new ZODB3 version exclusively, we can
remove the dependency onto the zope.broken distribution.
-- never fail if the suggested name is in a wrong type (#227617)
+- Never fail if the suggested name is in a wrong type (#227617)
-- checkName first checks the parameter type before the emptiness
+- ``checkName`` first checks the parameter type before the emptiness.
3.11.0 (2009-12-31)
-------------------
Modified: zope.container/trunk/src/zope/container/tests/test_btree.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_btree.py 2010-04-30 20:39:57 UTC (rev 111712)
+++ zope.container/trunk/src/zope/container/tests/test_btree.py 2010-04-30 20:43:09 UTC (rev 111713)
@@ -15,9 +15,9 @@
$Id$
"""
+from doctest import DocTestSuite
from unittest import TestCase, main, makeSuite, TestSuite
from zope.interface.verify import verifyObject
-from zope.testing.doctest import DocTestSuite
from zope.component.testing import setUp, tearDown
from zope.container.tests.test_icontainer import TestSampleContainer
from zope.container.btree import BTreeContainer
Modified: zope.container/trunk/src/zope/container/tests/test_constraints.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_constraints.py 2010-04-30 20:39:57 UTC (rev 111712)
+++ zope.container/trunk/src/zope/container/tests/test_constraints.py 2010-04-30 20:43:09 UTC (rev 111713)
@@ -15,8 +15,10 @@
$Id$
"""
+
+import doctest
import unittest
-from zope.testing import doctest, module
+from zope.testing import module
def setUp(test):
module.setUp(test, 'zope.container.constraints_txt')
Modified: zope.container/trunk/src/zope/container/tests/test_contained.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_contained.py 2010-04-30 20:39:57 UTC (rev 111712)
+++ zope.container/trunk/src/zope/container/tests/test_contained.py 2010-04-30 20:43:09 UTC (rev 111713)
@@ -15,8 +15,11 @@
$Id$
"""
+
+import doctest
+import gc
import unittest
-import gc
+
from ZODB.DemoStorage import DemoStorage
from ZODB.DB import DB
import transaction
@@ -24,7 +27,6 @@
import zope.interface
import zope.component
-from zope.testing import doctest
from zope.container.contained import ContainedProxy, NameChooser
from zope.container.sample import SampleContainer
Modified: zope.container/trunk/src/zope/container/tests/test_directory.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_directory.py 2010-04-30 20:39:57 UTC (rev 111712)
+++ zope.container/trunk/src/zope/container/tests/test_directory.py 2010-04-30 20:43:09 UTC (rev 111713)
@@ -15,12 +15,14 @@
$Id$
"""
+
+import doctest
from unittest import TestCase, TestSuite, main, makeSuite
-from zope.testing import doctest
+
from zope.container import testing
-
import zope.container.directory
+
class Directory(object):
pass
Modified: zope.container/trunk/src/zope/container/tests/test_ordered.py
===================================================================
--- zope.container/trunk/src/zope/container/tests/test_ordered.py 2010-04-30 20:39:57 UTC (rev 111712)
+++ zope.container/trunk/src/zope/container/tests/test_ordered.py 2010-04-30 20:43:09 UTC (rev 111713)
@@ -16,10 +16,12 @@
$Id$
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
+
from zope.component.eventtesting import getEvents, clearEvents
from zope.container import testing
+
def test_order_events():
"""
Prepare the setup::
More information about the checkins
mailing list