[Zope3-checkins] SVN: zope.testing/tags/regebro-python3-reloaded/s Big steps forward.

[Lennart Regebro]

Log message for revision 106255:
  Big steps forward.
  

Changed:
  U   zope.testing/tags/regebro-python3-reloaded/setup.py
  U   zope.testing/tags/regebro-python3-reloaded/src/zope/testing/testrunner/formatter.py

-=-
Modified: zope.testing/tags/regebro-python3-reloaded/setup.py
===================================================================
--- zope.testing/tags/regebro-python3-reloaded/setup.py	2009-12-07 19:22:43 UTC (rev 106254)
+++ zope.testing/tags/regebro-python3-reloaded/setup.py	2009-12-07 19:35:08 UTC (rev 106255)
@@ -50,6 +50,41 @@
     extra['install_requires'] = ['setuptools',
                                  'zope.exceptions >= 3.6.0dev',
                                  'zope.interface >= 3.6.0']
+    extra['convert_2to3_doctests'] = [
+        'src/zope/testing/doctests.txt',
+        'src/zope/testing/formparser.txt',
+        'src/zope/testing/module.txt',
+        'src/zope/testing/setupstack.txt',
+        'src/zope/testing/testrunner/testrunner-arguments.txt',
+        'src/zope/testing/testrunner/testrunner-coverage-win32.txt',
+        'src/zope/testing/testrunner/testrunner-coverage.txt',
+        'src/zope/testing/testrunner/testrunner-debugging-layer-setup.test',
+        'src/zope/testing/testrunner/testrunner-debugging.txt',
+        'src/zope/testing/testrunner/testrunner-discovery',
+        'src/zope/testing/testrunner/testrunner-edge-cases.txt',
+        'src/zope/testing/testrunner/testrunner-errors.txt',
+        'src/zope/testing/testrunner/testrunner-gc.txt',
+        'src/zope/testing/testrunner/testrunner-knit.txt',
+        'src/zope/testing/testrunner/testrunner-layers-api.txt',
+        'src/zope/testing/testrunner/testrunner-layers-buff.txt',
+        'src/zope/testing/testrunner/testrunner-layers-ntd.txt',
+        'src/zope/testing/testrunner/testrunner-layers.txt',
+        'src/zope/testing/testrunner/testrunner-leaks-err.txt',
+        'src/zope/testing/testrunner/testrunner-leaks.txt',
+        'src/zope/testing/testrunner/testrunner-profiling-cprofiler.txt',
+        'src/zope/testing/testrunner/testrunner-profiling.txt',
+        'src/zope/testing/testrunner/testrunner-progress.txt',
+        'src/zope/testing/testrunner/testrunner-repeat.txt',
+        'src/zope/testing/testrunner/testrunner-simple.txt',
+        'src/zope/testing/testrunner/testrunner-tb-format.txt',
+        'src/zope/testing/testrunner/testrunner-test-selection.txt',
+        'src/zope/testing/testrunner/testrunner-verbose.txt',
+        'src/zope/testing/testrunner/testrunner-wo-source.txt',
+        'src/zope/testing/testrunner/testrunner.txt',
+        'src/zope/testing/testrunner/testrunner-ex/sampletests.txt',
+        'src/zope/testing/testrunner/testrunner-ex/sampletestsl.txt',
+        'src/zope/testing/testrunner/testrunner-ex/unicode.txt',
+        ]
     extra['dependency_links'] = ['.']
 
 from setuptools.command.test import test
@@ -147,7 +182,12 @@
     author='Zope Corporation and Contributors',
     author_email='zope-dev at zope.org',
 
-    packages=["zope", "zope.testing", "zope.testing.testrunner"],
+    packages=["zope", "zope.testing", "zope.testing.testrunner",
+              "zope.testing.testrunner.testrunner-ex",
+              "zope.testing.testrunner.testrunner-ex-251759",
+              "zope.testing.testrunner.testrunner-ex-pp-lib",
+              "zope.testing.testrunner.testrunner-ex-pp-products",
+              ],
     package_dir = {'': 'src'},
 
     classifiers=[

Modified: zope.testing/tags/regebro-python3-reloaded/src/zope/testing/testrunner/formatter.py
===================================================================
--- zope.testing/tags/regebro-python3-reloaded/src/zope/testing/testrunner/formatter.py	2009-12-07 19:22:43 UTC (rev 106254)
+++ zope.testing/tags/regebro-python3-reloaded/src/zope/testing/testrunner/formatter.py	2009-12-07 19:35:08 UTC (rev 106255)
@@ -374,12 +374,18 @@
         # avoid reimporting a broken module in python 2.3
         sys.modules['curses'] = None
     else:
+        # If sys.stdout is not a real file object (e.g. in unit tests that 
+        # use various wrappers), you get an error, different depending on
+        # Python version:
+        if sys.version_info >= (3,):
+            import io
+            wrapped_stdout_error = io.UnsupportedOperation
+        else:
+            wrapped_stdout_error = TypeError
         try:
             curses.setupterm()
-        except (curses.error, TypeError):
+        except (curses.error, wrapped_stdout_error):
             # You get curses.error when $TERM is set to an unknown name
-            # You get TypeError when sys.stdout is not a real file object
-            # (e.g. in unit tests that use various wrappers).
             pass
         else:
             return curses.tigetnum(attr)