[Checkins] SVN: zope.testrunner/branches/no-zope-doctest/s Stop importing zope.testing.doctest.

Lennart Regebro regebro at gmail.com
Wed Apr 28 02:42:13 EDT 2010


Log message for revision 111522:
  Stop importing zope.testing.doctest.
  

Changed:
  A   zope.testrunner/branches/no-zope-doctest/setup.cfg
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc0.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc1.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcset.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcstats.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/pledge.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test1.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test11.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test111.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test112.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test12.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test121.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test122.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test_one.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletestsf.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/unicode.py
  U   zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/tests.py

-=-
Added: zope.testrunner/branches/no-zope-doctest/setup.cfg
===================================================================
--- zope.testrunner/branches/no-zope-doctest/setup.cfg	                        (rev 0)
+++ zope.testrunner/branches/no-zope-doctest/setup.cfg	2010-04-28 06:42:12 UTC (rev 111522)
@@ -0,0 +1,3 @@
+[egg_info]
+tag_build = dev
+tag_svn_revision = true

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc0.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc0.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc0.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope.testing import doctest
+import doctest
 
 def make_sure_gc_is_disabled():
     """

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc1.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc1.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gc1.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope.testing import doctest
+import doctest
 
 def make_sure_gc_threshold_is_one():
     """

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcset.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcset.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcset.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope.testing import doctest
+import doctest
 
 def make_sure_gc_threshold_is_701_11_9():
     """

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcstats.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcstats.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/gcstats.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope.testing import doctest
+import doctest
 
 def generate_some_gc_statistics():
     """

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/pledge.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/pledge.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/pledge.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-from zope.testing import doctest
+import doctest
 
 pledge_template = """\
 I give my pledge, as %s,

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample11/sampletests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sample13/sampletests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test1.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test11.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer11'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test111.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer111'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test112.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer112'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test12.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer12'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test121.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer121'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test122.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer122'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletests/test_one.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample1/sampletestsf.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/do-not-enter/sampletests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 def f():
     g()

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/donotenter/sampletests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 def f():
     g()

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sample21/sampletests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/test_1.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests/testone.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_1.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-from zope.testing import doctest
+import doctest
 
 def eek(self):
     """

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_e.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 def f():
     g()

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/sampletests_ntds.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -17,7 +17,7 @@
 """
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 class Layer:
 

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample2/stderrtest.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -17,7 +17,7 @@
 """
 
 import unittest
-from zope.testing import doctest
+import doctest
 import sys
 
 

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sample3/sampletests_d.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -17,7 +17,7 @@
 """
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 class TestSomething(unittest.TestCase):
 

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test1.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test1.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test1.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test11.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test11.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test11.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer11'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test111.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test111.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test111.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer111'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test112.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test112.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test112.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer112'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test12.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test12.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test12.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer12'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test121.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test121.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test121.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer121'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test122.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test122.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test122.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 import samplelayers
 
 layername = 'samplelayers.Layer122'

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test_one.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test_one.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletests/test_one.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletestsf.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletestsf.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/sampletestsf.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 import unittest
-from zope.testing import doctest
+import doctest
 
 x=0
 y=0

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/unicode.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/unicode.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/testrunner-ex/unicode.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-from zope.testing import doctest
+import doctest
 
 def test_suite():
     return doctest.DocFileSuite('unicode.txt')

Modified: zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/tests.py
===================================================================
--- zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/tests.py	2010-04-28 06:40:43 UTC (rev 111521)
+++ zope.testrunner/branches/no-zope-doctest/src/zope/testrunner/tests.py	2010-04-28 06:42:12 UTC (rev 111522)
@@ -22,7 +22,7 @@
 import sys
 import unittest
 
-from zope.testing import doctest
+import doctest
 from zope.testing import renormalizing
 
 



More information about the checkins mailing list