summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2010-04-16 19:43:57 +0000
committerTres Seaver <tseaver@palladion.com>2010-04-16 19:43:57 +0000
commit00243404b250d234cf02383959adaffa30ea6865 (patch)
treeeb84fbd07ae66a243ffb8a6f4a59b45353cf345d
parent0bc2d7e51335433bbf7a016881740d0c66d7896a (diff)
downloadzope-i18n-00243404b250d234cf02383959adaffa30ea6865.tar.gz
Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.
-rw-r--r--CHANGES.txt2
-rw-r--r--src/zope/i18n/locales/tests/test_docstrings.py5
-rw-r--r--src/zope/i18n/locales/tests/test_fallbackcollator.py2
-rw-r--r--src/zope/i18n/tests/test.py2
-rw-r--r--src/zope/i18n/tests/test_testmessagecatalog.py2
5 files changed, 7 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8e8e130..bebdc85 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,7 @@ CHANGES
Next release
------------
-- ...
+- Removed use of 'zope.testing.doctestunit' in favor of stdlib's 'doctest.
3.7.2 (2009-12-14)
------------------
diff --git a/src/zope/i18n/locales/tests/test_docstrings.py b/src/zope/i18n/locales/tests/test_docstrings.py
index ec181ff..874c347 100644
--- a/src/zope/i18n/locales/tests/test_docstrings.py
+++ b/src/zope/i18n/locales/tests/test_docstrings.py
@@ -16,8 +16,9 @@
$Id$
"""
import unittest
-from zope.testing.doctestunit import DocTestSuite
-from zope.i18n.locales.inheritance import AttributeInheritance, NoParentException
+from doctest import DocTestSuite
+from zope.i18n.locales.inheritance import AttributeInheritance
+from zope.i18n.locales.inheritance import NoParentException
class LocaleInheritanceStub(AttributeInheritance):
diff --git a/src/zope/i18n/locales/tests/test_fallbackcollator.py b/src/zope/i18n/locales/tests/test_fallbackcollator.py
index 071652d..73aa2d5 100644
--- a/src/zope/i18n/locales/tests/test_fallbackcollator.py
+++ b/src/zope/i18n/locales/tests/test_fallbackcollator.py
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
def test_suite():
return unittest.TestSuite((
diff --git a/src/zope/i18n/tests/test.py b/src/zope/i18n/tests/test.py
index 17993f5..d7cf557 100644
--- a/src/zope/i18n/tests/test.py
+++ b/src/zope/i18n/tests/test.py
@@ -17,7 +17,7 @@ $Id$
"""
import unittest
-from zope.testing import doctest
+import doctest
from zope.component.testing import setUp, tearDown
diff --git a/src/zope/i18n/tests/test_testmessagecatalog.py b/src/zope/i18n/tests/test_testmessagecatalog.py
index a81474b..22dcb8a 100644
--- a/src/zope/i18n/tests/test_testmessagecatalog.py
+++ b/src/zope/i18n/tests/test_testmessagecatalog.py
@@ -13,7 +13,7 @@
##############################################################################
import unittest
-from zope.testing import doctest
+import doctest
def test_suite():
return unittest.TestSuite((