[Checkins] SVN: zope.testbrowser/branches/3.4/ Avoid deprecated zope.testing.doctest.

[Marius Gedminas]

Log message for revision 110184:
  Avoid deprecated zope.testing.doctest.
  
  (Bit of a futile gesture, since zope.app.testing.functional imports it anyway,
  at least in its current KGS incarnation.)
  
  

Changed:
  U   zope.testbrowser/branches/3.4/CHANGES.txt
  U   zope.testbrowser/branches/3.4/src/zope/testbrowser/testing.py
  U   zope.testbrowser/branches/3.4/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/branches/3.4/CHANGES.txt
===================================================================
--- zope.testbrowser/branches/3.4/CHANGES.txt	2010-03-25 16:34:35 UTC (rev 110183)
+++ zope.testbrowser/branches/3.4/CHANGES.txt	2010-03-25 16:37:17 UTC (rev 110184)
@@ -11,6 +11,8 @@
 - Pin dependency versions to Zope 3.4 KGS, because the 3.4 series of
   zope.testbrowser doesn't work with newer versions of, e.g. zope.component.
 
+- Avoid deprecated zope.testing.doctest.
+
 3.4.3 (2008-10-13)
 ------------------
 

Modified: zope.testbrowser/branches/3.4/src/zope/testbrowser/testing.py
===================================================================
--- zope.testbrowser/branches/3.4/src/zope/testbrowser/testing.py	2010-03-25 16:34:35 UTC (rev 110183)
+++ zope.testbrowser/branches/3.4/src/zope/testbrowser/testing.py	2010-03-25 16:37:17 UTC (rev 110184)
@@ -18,6 +18,7 @@
 import re
 import sys
 import unittest
+import doctest
 import httplib
 import urllib2
 from cStringIO import StringIO
@@ -26,7 +27,7 @@
 
 import transaction
 from zope.testbrowser import browser
-from zope.testing import renormalizing, doctest
+from zope.testing import renormalizing
 
 from zope.app.testing import functional
 from zope.app.folder.folder import Folder

Modified: zope.testbrowser/branches/3.4/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/branches/3.4/src/zope/testbrowser/tests.py	2010-03-25 16:34:35 UTC (rev 110183)
+++ zope.testbrowser/branches/3.4/src/zope/testbrowser/tests.py	2010-03-25 16:37:17 UTC (rev 110184)
@@ -20,13 +20,13 @@
 from zope.app.testing import functional
 from zope.app.testing.functional import FunctionalDocFileSuite
 from zope.testbrowser import browser
-from zope.testing import renormalizing, doctest
+from zope.testing import renormalizing
 import httplib
 import mechanize
 import os
 import re
 import unittest
-import unittest
+import doctest
 import urllib2
 
 
@@ -382,7 +382,6 @@
     __name__, 'TestBrowserLayer', allow_teardown=True)
 
 def test_suite():
-    from zope.testing import doctest
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     readme = FunctionalDocFileSuite('README.txt', optionflags=flags,
         checker=checker)