[Checkins] SVN: zope.testing/trunk/src/zope/testing/ Merge from nikhil_n-py25 branch:

nikhil n nikhil.n.n at gmail.com
Thu Jun 21 09:53:27 EDT 2007


Log message for revision 76900:
  Merge from nikhil_n-py25 branch:
      Made zope.testing work with Python 2.5, also tested in 2.4 & 2.3
  

Changed:
  U   zope.testing/trunk/src/zope/testing/doctest.py
  U   zope.testing/trunk/src/zope/testing/testrunner.py

-=-
Modified: zope.testing/trunk/src/zope/testing/doctest.py
===================================================================
--- zope.testing/trunk/src/zope/testing/doctest.py	2007-06-21 13:46:43 UTC (rev 76899)
+++ zope.testing/trunk/src/zope/testing/doctest.py	2007-06-21 13:53:27 UTC (rev 76900)
@@ -354,7 +354,10 @@
     def __init__(self, out):
         self.__out = out
         self.__debugger_used = False
-        pdb.Pdb.__init__(self)
+        try:
+	    pdb.Pdb.__init__(self, stdin=sys.stdin, stdout=out)
+        except TypeError:
+            pdb.Pdb.__init__(self) 
 
     def set_trace(self):
         self.__debugger_used = True

Modified: zope.testing/trunk/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner.py	2007-06-21 13:46:43 UTC (rev 76899)
+++ zope.testing/trunk/src/zope/testing/testrunner.py	2007-06-21 13:53:27 UTC (rev 76900)
@@ -2015,6 +2015,9 @@
                     r'exceptions.\1Error:'),
 
         (re.compile('^> [^\n]+->None$', re.M), '> ...->None'),
+        (re.compile(r"<module>"),(r'?')),
+        (re.compile(r"<type 'exceptions.(\w+)Error'>:"),
+                    r'exceptions.\1Error:'),
         (re.compile("'[A-Za-z]:\\\\"), "'"), # hopefully, we'll make Windows happy
         (re.compile(r'\\\\'), '/'), # more Windows happiness
         (re.compile(r'\\'), '/'), # even more Windows happiness



More information about the Checkins mailing list