[Zope-Checkins] SVN: Zope/branches/2.12/ Updated to the latest zope.testing and backport the deprecation avoidance changes for zope.testing.doctest
Hanno Schlichting
hannosch at hannosch.eu
Sun Apr 18 19:34:27 EDT 2010
Log message for revision 111032:
Updated to the latest zope.testing and backport the deprecation avoidance changes for zope.testing.doctest
Changed:
U Zope/branches/2.12/doc/CHANGES.rst
U Zope/branches/2.12/src/AccessControl/tests/testZopeGuards.py
U Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py
U Zope/branches/2.12/src/App/tests/test_class_init.py
U Zope/branches/2.12/src/Missing/tests.py
U Zope/branches/2.12/src/MultiMapping/tests.py
U Zope/branches/2.12/src/Products/Five/browser/tests/test_decode.py
U Zope/branches/2.12/src/Products/Five/browser/tests/test_i18n.py
U Zope/branches/2.12/src/Products/Five/browser/tests/test_zope3security.py
U Zope/branches/2.12/src/Products/Five/component/tests.py
U Zope/branches/2.12/src/Products/Five/tests/test_event.py
U Zope/branches/2.12/src/Products/Five/tests/test_i18n.py
U Zope/branches/2.12/src/Products/Five/utilities/browser/tests/test_marker.py
U Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/__init__.py
U Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/functional.py
U Zope/branches/2.12/src/ThreadLock/tests.py
U Zope/branches/2.12/src/ZPublisher/tests/testBeforeTraverse.py
U Zope/branches/2.12/src/ZPublisher/tests/testPublish.py
U Zope/branches/2.12/versions.cfg
-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/doc/CHANGES.rst 2010-04-18 23:34:27 UTC (rev 111032)
@@ -11,6 +11,9 @@
Features Added
++++++++++++++
+- Use the standard libraries doctest module in favor of the deprecated version
+ in zope.testing.
+
- Updated packages:
- distribute = 0.6.10
Modified: Zope/branches/2.12/src/AccessControl/tests/testZopeGuards.py
===================================================================
--- Zope/branches/2.12/src/AccessControl/tests/testZopeGuards.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/AccessControl/tests/testZopeGuards.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -17,13 +17,13 @@
$Id$
"""
+import doctest
import unittest
import os
import operator
import sys
-from zope.testing import doctest
import ZODB
Modified: Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py
===================================================================
--- Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/AccessControl/tests/testZopeSecurityPolicy.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -574,7 +574,7 @@
"""
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
suite = unittest.TestSuite()
Modified: Zope/branches/2.12/src/App/tests/test_class_init.py
===================================================================
--- Zope/branches/2.12/src/App/tests/test_class_init.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/App/tests/test_class_init.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -31,7 +31,7 @@
>>> InitializeClass(C)
"""
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
import unittest
def test_suite():
Modified: Zope/branches/2.12/src/Missing/tests.py
===================================================================
--- Zope/branches/2.12/src/Missing/tests.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Missing/tests.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -36,7 +36,7 @@
$Id$
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: Zope/branches/2.12/src/MultiMapping/tests.py
===================================================================
--- Zope/branches/2.12/src/MultiMapping/tests.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/MultiMapping/tests.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -50,7 +50,7 @@
$Id$
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: Zope/branches/2.12/src/Products/Five/browser/tests/test_decode.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/browser/tests/test_decode.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/browser/tests/test_decode.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -49,5 +49,5 @@
"""
def test_suite():
- from zope.testing.doctest import DocTestSuite
+ from doctest import DocTestSuite
return DocTestSuite()
Modified: Zope/branches/2.12/src/Products/Five/browser/tests/test_i18n.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/browser/tests/test_i18n.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/browser/tests/test_i18n.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -86,5 +86,5 @@
def test_suite():
from Testing.ZopeTestCase import FunctionalDocTestSuite
- from zope.testing.doctest import ELLIPSIS
+ from doctest import ELLIPSIS
return FunctionalDocTestSuite(optionflags=ELLIPSIS)
Modified: Zope/branches/2.12/src/Products/Five/browser/tests/test_zope3security.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/browser/tests/test_zope3security.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/browser/tests/test_zope3security.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -55,5 +55,5 @@
def test_suite():
from Testing.ZopeTestCase import FunctionalDocTestSuite
- from zope.testing.doctest import ELLIPSIS
+ from doctest import ELLIPSIS
return FunctionalDocTestSuite(optionflags=ELLIPSIS)
Modified: Zope/branches/2.12/src/Products/Five/component/tests.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/component/tests.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/component/tests.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing.doctestunit import DocFileSuite
+from doctest import DocFileSuite
from Testing.ZopeTestCase import FunctionalDocFileSuite
__docformat__ = "reStructuredText"
Modified: Zope/branches/2.12/src/Products/Five/tests/test_event.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/tests/test_event.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/tests/test_event.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -83,6 +83,6 @@
def test_suite():
- from zope.testing.doctest import DocFileSuite
+ from doctest import DocFileSuite
return DocFileSuite('event.txt', package="Products.Five.tests",
setUp=setUp, tearDown=testing.tearDown)
Modified: Zope/branches/2.12/src/Products/Five/tests/test_i18n.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/tests/test_i18n.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/tests/test_i18n.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -55,5 +55,5 @@
def test_suite():
- from zope.testing.doctest import DocTestSuite
+ from doctest import DocTestSuite
return DocTestSuite(setUp=setUp, tearDown=tearDown)
Modified: Zope/branches/2.12/src/Products/Five/utilities/browser/tests/test_marker.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/utilities/browser/tests/test_marker.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Products/Five/utilities/browser/tests/test_marker.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -48,7 +48,7 @@
Try to add a marker interface that doesn't exist:
- >>> view.update(('__builtin__.IFooMarker',), ())
+ >>> view.update(('__main__.IFooMarker',), ())
Traceback (most recent call last):
...
ComponentLookupError...
@@ -66,7 +66,7 @@
And try again to add it to the object:
- >>> view.update(('__builtin__.IFooMarker',), ())
+ >>> view.update(('__main__.IFooMarker',), ())
>>> view.getAvailableInterfaceNames()
[]
>>> view.getDirectlyProvidedNames()
@@ -74,7 +74,7 @@
And remove it again:
- >>> view.update((), ('__builtin__.IFooMarker',))
+ >>> view.update((), ('__main__.IFooMarker',))
>>> view.getAvailableInterfaceNames()
[...IFooMarker...]
>>> view.getDirectlyProvidedNames()
Modified: Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/__init__.py
===================================================================
--- Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/__init__.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/__init__.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -15,7 +15,5 @@
$Id$
"""
-from zope.testing.doctest import *
-from zope.testing.doctest import _normalize_module
+from doctest import *
from functional import *
-
Modified: Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/functional.py
===================================================================
--- Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/functional.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/Testing/ZopeTestCase/zopedoctest/functional.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -15,12 +15,14 @@
$Id$
"""
-import sys, re, base64
+import base64
+import doctest
+import re
+import sys
import warnings
+
import transaction
-from zope.testing import doctest
-
from Testing.ZopeTestCase import ZopeTestCase
from Testing.ZopeTestCase import FunctionalTestCase
from Testing.ZopeTestCase import Functional
@@ -93,7 +95,6 @@
def auth_header(header):
match = basicre.match(header)
if match:
- import base64
u, p = match.group(1, 2)
if u is None:
u = ''
Modified: Zope/branches/2.12/src/ThreadLock/tests.py
===================================================================
--- Zope/branches/2.12/src/ThreadLock/tests.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/ThreadLock/tests.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -57,7 +57,7 @@
import ThreadLock, threading, time
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: Zope/branches/2.12/src/ZPublisher/tests/testBeforeTraverse.py
===================================================================
--- Zope/branches/2.12/src/ZPublisher/tests/testBeforeTraverse.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/ZPublisher/tests/testBeforeTraverse.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -133,7 +133,8 @@
"""
pass
-from zope.testing import doctest
+import doctest
+
def test_suite():
return doctest.DocTestSuite(optionflags=doctest.ELLIPSIS)
Modified: Zope/branches/2.12/src/ZPublisher/tests/testPublish.py
===================================================================
--- Zope/branches/2.12/src/ZPublisher/tests/testPublish.py 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/src/ZPublisher/tests/testPublish.py 2010-04-18 23:34:27 UTC (rev 111032)
@@ -391,7 +391,7 @@
pass
-from zope.testing import doctest
+import doctest
def test_suite():
return doctest.DocTestSuite()
Modified: Zope/branches/2.12/versions.cfg
===================================================================
--- Zope/branches/2.12/versions.cfg 2010-04-18 23:09:41 UTC (rev 111031)
+++ Zope/branches/2.12/versions.cfg 2010-04-18 23:34:27 UTC (rev 111032)
@@ -133,7 +133,7 @@
zope.tal = 3.5.2
zope.tales = 3.4.0
zope.testbrowser = 3.6.0a2
-zope.testing = 3.7.7
+zope.testing = 3.9.4
zope.thread = 3.4
zope.traversing = 3.7.1
zope.viewlet = 3.6.1
More information about the Zope-Checkins
mailing list