No longer using deprecated zope.testing.doctest by using python's…

… built-in ``doctest`` module.

CHANGES.txt

@@ -14,6 +14,8 @@ CHANGES
 
 - Added missing dependency on ``zope.contentprovider``.
 
+- No longer using deprecated ``zope.testing.doctest`` by using
+  python's built-in ``doctest`` module.
 
 2.4.0 (2010-07-01)
 ------------------

src/z3c/form/testing.py

@@ -11,26 +11,22 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Common z3c.form test setups
+"""Common z3c.form test setups"""
 
-$Id$
-"""
-__docformat__ = 'restructuredtext'
 import os
-
 import zope.component
+import zope.configuration.xmlconfig
 import zope.interface
 import zope.schema
-from zope.schema.fieldproperty import FieldProperty
-import zope.configuration.xmlconfig
 
+from doctest import register_optionflag
+from zope.app.testing import setup
 from zope.pagetemplate.interfaces import IPageTemplate
 from zope.publisher.browser import TestRequest
+from zope.schema.fieldproperty import FieldProperty
+from zope.security import checker
 from zope.security.interfaces import IInteraction
 from zope.security.interfaces import ISecurityPolicy
-from zope.security import checker
-from zope.app.testing import setup
-from zope.testing.doctest import register_optionflag
 
 from z3c.form import browser, button, converter, datamanager, error, field
 from z3c.form import form, interfaces, term, validator, widget

src/z3c/form/tests/test_doc.py

@@ -11,16 +11,14 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""z3c.form Test Module
+"""z3c.form Test Module"""
 
-$Id$
-"""
-__docformat__ = "reStructuredText"
-import unittest
+import doctest
 import itertools
 import re
+import unittest
 
-from zope.testing import doctest, renormalizing
+from zope.testing import renormalizing
 from zope.app.testing import placelesssetup
 
 from z3c.form import testing