[Zope3-checkins] SVN: zope.testing/branches/regebro-400/src/zope/testing/ Testrunner and doctest BBB dropped.

[Lennart Regebro]

Log message for revision 111517:
  Testrunner and doctest BBB dropped.
  

Changed:
  D   zope.testing/branches/regebro-400/src/zope/testing/doctest/
  D   zope.testing/branches/regebro-400/src/zope/testing/testrunner.py
  U   zope.testing/branches/regebro-400/src/zope/testing/tests.py

-=-
Deleted: zope.testing/branches/regebro-400/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/branches/regebro-400/src/zope/testing/testrunner.py	2010-04-28 06:21:28 UTC (rev 111516)
+++ zope.testing/branches/regebro-400/src/zope/testing/testrunner.py	2010-04-28 06:24:28 UTC (rev 111517)
@@ -1,11 +0,0 @@
-import warnings
-warnings.warn('zope.testing.testrunner is deprecated in favour of '
-              'zope.testrunner', DeprecationWarning, stacklevel=2)
-
-try:
-    from zope import testrunner
-    import zope.testing
-    # Now replace this module with the right one:
-    zope.testing.testrunner = testrunner
-except ImportError:
-    pass
\ No newline at end of file

Modified: zope.testing/branches/regebro-400/src/zope/testing/tests.py
===================================================================
--- zope.testing/branches/regebro-400/src/zope/testing/tests.py	2010-04-28 06:21:28 UTC (rev 111516)
+++ zope.testing/branches/regebro-400/src/zope/testing/tests.py	2010-04-28 06:24:28 UTC (rev 111517)
@@ -16,23 +16,16 @@
 
 import sys
 import re
+import doctest
 import unittest
 import warnings
 from zope.testing import renormalizing
 
-# Yes, it is deprecated, but we want to run tests on it here.
-warnings.filterwarnings("ignore", "zope.testing.doctest is deprecated",
-                        DeprecationWarning, __name__, 0)
-
-from zope.testing import doctest
-
-
 def test_suite():
     suite = unittest.TestSuite((
         doctest.DocTestSuite('zope.testing.loggingsupport'),
         doctest.DocTestSuite('zope.testing.renormalizing'),
         doctest.DocTestSuite('zope.testing.server'),
-        doctest.DocFileSuite('doctest.txt'),
         doctest.DocFileSuite('formparser.txt'),
         doctest.DocFileSuite(
             'module.txt',
@@ -46,6 +39,4 @@
         doctest.DocFileSuite('setupstack.txt'),
         ))
 
-    if sys.version < '3':
-        suite.addTests(doctest.DocFileSuite('unicode.txt'))
     return suite