[Checkins] SVN: zope.testrunner/trunk/ Removing all obvious traces of Python 2.3 support.

[Lennart Regebro]

Log message for revision 111568:
  Removing all obvious traces of Python 2.3 support.
  

Changed:
  U   zope.testrunner/trunk/DEVELOPING.txt
  U   zope.testrunner/trunk/setup.py
  U   zope.testrunner/trunk/src/zope/testrunner/__init__.py
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt
  U   zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt

-=-
Modified: zope.testrunner/trunk/DEVELOPING.txt
===================================================================
--- zope.testrunner/trunk/DEVELOPING.txt	2010-04-29 10:05:57 UTC (rev 111567)
+++ zope.testrunner/trunk/DEVELOPING.txt	2010-04-29 10:27:06 UTC (rev 111568)
@@ -40,6 +40,6 @@
       Tear down zope.testrunner.layer.UnitTests in 0.000 seconds.
 
 Which one you prefer is much a matter of taste. At the moment of writing
-buildout does not support Python 3, and therefore you must use this way
-of testing under Python 3.
+buildout does not support Python 3, and therefore you must use the latter way
+of running the tests in Python 3.
 

Modified: zope.testrunner/trunk/setup.py
===================================================================
--- zope.testrunner/trunk/setup.py	2010-04-29 10:05:57 UTC (rev 111567)
+++ zope.testrunner/trunk/setup.py	2010-04-29 10:27:06 UTC (rev 111568)
@@ -25,6 +25,10 @@
 import sys
 from setuptools import setup
 
+if sys.version_info < (2,4) or sys.version_info[:2] == (3,0):
+    raise ValueError("zope.testrunner requires Python 2.4 or higher, "
+                     "but not Python 3.0.")
+    
 if sys.version_info >= (3,):
     extra = dict(use_2to3 = True,
                  setup_requires = ['zope.fixers'],

Modified: zope.testrunner/trunk/src/zope/testrunner/__init__.py
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/__init__.py	2010-04-29 10:05:57 UTC (rev 111567)
+++ zope.testrunner/trunk/src/zope/testrunner/__init__.py	2010-04-29 10:27:06 UTC (rev 111568)
@@ -46,18 +46,6 @@
     return runner.failed
 
 
-###############################################################################
-# Install 2.4 TestSuite __iter__ into earlier versions
-
-if sys.version_info < (2, 4):
-    def __iter__(suite):
-        return iter(suite._tests)
-    unittest.TestSuite.__iter__ = __iter__
-    del __iter__
-
-# Install 2.4 TestSuite __iter__ into earlier versions
-###############################################################################
-
 if __name__ == '__main__':
     # allow people to try out the test runner with
     # python -m zope.testrunner --test-path .

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test	2010-04-29 10:05:57 UTC (rev 111567)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging-layer-setup.test	2010-04-29 10:27:06 UTC (rev 111568)
@@ -35,10 +35,7 @@
     ...         return line+'\n'
 
     >>> real_stdin = sys.stdin
-    >>> if sys.version_info[:2] == (2, 3):
-    ...     sys.stdin = Input('n\np x\nc')
-    ... else:
-    ...     sys.stdin = Input('p x\nc')
+    >>> sys.stdin = Input('p x\nc')
 
     >>> sys.argv = [testrunner_script]
     >>> import zope.testrunner
@@ -59,10 +56,7 @@
 Note that post-mortem debugging doesn't work when the layer is run in
 a subprocess:
 
-    >>> if sys.version_info[:2] == (2, 3):
-    ...     sys.stdin = Input('n\np x\nc')
-    ... else:
-    ...     sys.stdin = Input('p x\nc')
+    >>> sys.stdin = Input('p x\nc')
 
     >>> written = open(os.path.join(dir, 'tests2.py'), 'w').write(
     ... '''

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt	2010-04-29 10:05:57 UTC (rev 111567)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-debugging.txt	2010-04-29 10:27:06 UTC (rev 111568)
@@ -25,10 +25,7 @@
     ...     ]
 
     >>> real_stdin = sys.stdin
-    >>> if sys.version_info[:2] == (2, 3):
-    ...     sys.stdin = Input('n\np x\nc')
-    ... else:
-    ...     sys.stdin = Input('p x\nc')
+    >>> sys.stdin = Input('p x\nc')
 
     >>> sys.argv = ('test -ssample3 --tests-pattern ^sampletests_d$'
     ...             ' -t set_trace1').split()

Modified: zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt
===================================================================
--- zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt	2010-04-29 10:05:57 UTC (rev 111567)
+++ zope.testrunner/trunk/src/zope/testrunner/testrunner-edge-cases.txt	2010-04-29 10:27:06 UTC (rev 111568)
@@ -85,10 +85,7 @@
 
 Using pdb.set_trace in a function called by an ordinary test:
 
-    >>> if sys.version_info[:2] == (2, 3):
-    ...     sys.stdin = Input('n\np x\nc')
-    ... else:
-    ...     sys.stdin = Input('p x\nc')
+    >>> sys.stdin = Input('p x\nc')
     >>> sys.argv = ('test -ssample3 --tests-pattern ^sampletests_d$'
     ...             ' -t set_trace2').split()
     >>> try: testrunner.run_internal(defaults)