[Checkins] SVN: zope.configuration/trunk/ Adjust testing output to newer zope.schema. Prefer zope.testing.doctest over doctestunit.
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 22 10:11:04 EST 2009
Log message for revision 106877:
Adjust testing output to newer zope.schema. Prefer zope.testing.doctest over doctestunit.
Changed:
U zope.configuration/trunk/CHANGES.txt
U zope.configuration/trunk/setup.py
U zope.configuration/trunk/src/zope/configuration/fields.py
U zope.configuration/trunk/src/zope/configuration/tests/test_config.py
U zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py
U zope.configuration/trunk/src/zope/configuration/tests/test_nested.py
U zope.configuration/trunk/src/zope/configuration/tests/test_simple.py
U zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py
-=-
Modified: zope.configuration/trunk/CHANGES.txt
===================================================================
--- zope.configuration/trunk/CHANGES.txt 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/CHANGES.txt 2009-12-22 15:11:04 UTC (rev 106877)
@@ -2,11 +2,13 @@
Changes
=======
-3.6.1 (unreleased)
+3.7.0 (unreleased)
------------------
-- ...
+- Adjust testing output to newer zope.schema.
+- Prefer zope.testing.doctest over doctestunit.
+
3.6.0 (2009-04-01)
------------------
Modified: zope.configuration/trunk/setup.py
===================================================================
--- zope.configuration/trunk/setup.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/setup.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -27,7 +27,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.configuration',
- version = '3.6.1dev',
+ version = '3.7.0dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='Zope Configuration Markup Language (ZCML)',
Modified: zope.configuration/trunk/src/zope/configuration/fields.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/fields.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/src/zope/configuration/fields.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -100,7 +100,7 @@
>>> gg.fromUnicode("z")
Traceback (most recent call last):
...
- WrongType: ('zope', (<type 'int'>, <type 'long'>))
+ WrongType: ('zope', (<type 'int'>, <type 'long'>), '')
>>> g = GlobalObject(constraint=lambda x: x%2 == 0)
>>> gg = g.bind(fake)
@@ -171,7 +171,7 @@
>>> gg.fromUnicode('Foo')
Traceback (most recent call last):
...
- WrongType: An interface is required
+ WrongType: ('An interface is required', <class 'zope.configuration.fields.Foo'>, '')
"""
def __init__(self, **kw):
@@ -211,7 +211,7 @@
>>> gg.fromUnicode("z y")
Traceback (most recent call last):
...
- InvalidToken: ('zope', (<type 'int'>, <type 'long'>)) in z y
+ InvalidToken: ('zope', (<type 'int'>, <type 'long'>), '') in z y
>>> gg.fromUnicode("y y")
[42, 42]
>>>
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_config.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_config.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_config.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -19,7 +19,7 @@
import sys
import unittest
import re
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
from zope.testing import renormalizing
from zope.configuration.config import metans, ConfigurationMachine
from zope.configuration import config
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_docutils.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_nested.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_nested.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_nested.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -185,7 +185,7 @@
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
from zope import interface, schema
from zope.configuration import config, xmlconfig, fields
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_simple.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_simple.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_simple.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -168,9 +168,9 @@
file_registry = []
-
+
import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing.doctest import DocTestSuite
from zope import interface
from zope import schema
from zope.configuration import fields, xmlconfig
Modified: zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py 2009-12-22 15:06:37 UTC (rev 106876)
+++ zope.configuration/trunk/src/zope/configuration/tests/test_xmlconfig.py 2009-12-22 15:11:04 UTC (rev 106877)
@@ -18,7 +18,7 @@
import unittest
import os
import re
-from zope.testing.doctestunit import DocTestSuite, DocFileSuite
+from zope.testing.doctest import DocTestSuite, DocFileSuite
from zope.testing import renormalizing
from zope.configuration import xmlconfig, config
from zope.configuration.tests.samplepackage import foo
More information about the checkins
mailing list