[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Forward port c113200 from 2.2 branch

[Hanno Schlichting]

Log message for revision 113201:
  Forward port c113200 from 2.2 branch
  

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/tests.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2010-06-06 13:51:18 UTC (rev 113200)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2010-06-06 13:52:42 UTC (rev 113201)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Use the standard libraries doctest module.
+
 - skins: Removed unused styles from css.
 
 - Require at least Zope 2.12.3 and use the optional five.formlib extension.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/tests.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/tests.py	2010-06-06 13:51:18 UTC (rev 113200)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/tests.py	2010-06-06 13:52:42 UTC (rev 113201)
@@ -15,10 +15,9 @@
 $Id$
 """
 
+import doctest
 import unittest
-import Testing
 from Testing import ZopeTestCase
-from zope.testing import doctest
 
 from Products.CMFCore.PortalContent import PortalContent
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl