[Checkins] SVN: zc.buildout/trunk/ Got rid of remove zope.testing.doctest

[Lennart Regebro]

Log message for revision 114917:
  Got rid of remove zope.testing.doctest

Changed:
  U   zc.buildout/trunk/buildout.cfg
  U   zc.buildout/trunk/src/zc/buildout/tests.py
  U   zc.buildout/trunk/src/zc/buildout/testselectingpython.py
  U   zc.buildout/trunk/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py

-=-
Modified: zc.buildout/trunk/buildout.cfg
===================================================================
--- zc.buildout/trunk/buildout.cfg	2010-07-22 07:29:10 UTC (rev 114916)
+++ zc.buildout/trunk/buildout.cfg	2010-07-22 07:29:42 UTC (rev 114917)
@@ -14,6 +14,7 @@
   zc.buildout
   zc.recipe.egg
   z3c.recipe.scripts
+  zope.testing
 
 # Tests that can be run wo a network
 [oltest]

Modified: zc.buildout/trunk/src/zc/buildout/tests.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/tests.py	2010-07-22 07:29:10 UTC (rev 114916)
+++ zc.buildout/trunk/src/zc/buildout/tests.py	2010-07-22 07:29:42 UTC (rev 114917)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope.testing import doctest
+import doctest
 from zope.testing import renormalizing
 import os
 import pkg_resources

Modified: zc.buildout/trunk/src/zc/buildout/testselectingpython.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/testselectingpython.py	2010-07-22 07:29:10 UTC (rev 114916)
+++ zc.buildout/trunk/src/zc/buildout/testselectingpython.py	2010-07-22 07:29:42 UTC (rev 114917)
@@ -11,8 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import os, re, subprocess, sys, textwrap, unittest
-from zope.testing import doctest, renormalizing
+import os, re, subprocess, sys, textwrap, unittest, doctest
+from zope.testing import renormalizing
 import zc.buildout.tests
 import zc.buildout.testing
 

Modified: zc.buildout/trunk/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py
===================================================================
--- zc.buildout/trunk/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py	2010-07-22 07:29:10 UTC (rev 114916)
+++ zc.buildout/trunk/z3c.recipe.scripts_/src/z3c/recipe/scripts/tests.py	2010-07-22 07:29:42 UTC (rev 114917)
@@ -17,8 +17,8 @@
 import zc.buildout.testselectingpython
 import zc.buildout.testing
 
-import unittest
-from zope.testing import doctest, renormalizing
+import unittest, doctest
+from zope.testing import renormalizing
 
 # We do not explicitly test the recipe support for the ``eggs``,
 # ``find-links``, and ``index`` options because they are used for most or

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2010-07-22 07:29:10 UTC (rev 114916)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2010-07-22 07:29:42 UTC (rev 114917)
@@ -17,8 +17,8 @@
 import zc.buildout.testselectingpython
 import zc.buildout.testing
 
-import unittest
-from zope.testing import doctest, renormalizing
+import unittest, doctest
+from zope.testing import renormalizing
 
 os_path_sep = os.path.sep
 if os_path_sep == '\\':