[Python-checkins] CVS: python/dist/src/Lib doctest.py,1.4,1.5

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv19069/python/dist/src/Lib

Modified Files:
	doctest.py 
Log Message:
Teach doctest about newer "(most recent call last)" traceback spelling.


Index: doctest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** doctest.py	2001/02/10 01:24:50	1.4
--- doctest.py	2001/02/13 20:54:42	1.5
***************
*** 161,165 ****
  
      >>> 1/0
!     Traceback (innermost last):
        File "<stdin>", line 1, in ?
      ZeroDivisionError: integer division or modulo by zero
--- 161,165 ----
  
      >>> 1/0
!     Traceback (most recent call last):
        File "<stdin>", line 1, in ?
      ZeroDivisionError: integer division or modulo by zero
***************
*** 247,251 ****
  Trying: 1/0
  Expecting:
! Traceback (innermost last):
    File "<stdin>", line 1, in ?
  ZeroDivisionError: integer division or modulo by zero
--- 247,251 ----
  Trying: 1/0
  Expecting:
! Traceback (most recent call last):
    File "<stdin>", line 1, in ?
  ZeroDivisionError: integer division or modulo by zero
***************
*** 490,494 ****
          except:
              # See whether the exception was expected.
!             if want.find("Traceback (innermost last):\n") == 0:
                  # Only compare exception type and value - the rest of
                  # the traceback isn't necessary.
--- 490,495 ----
          except:
              # See whether the exception was expected.
!             if want.find("Traceback (innermost last):\n") == 0 or \
!                want.find("Traceback (most recent call last):\n") == 0:
                  # Only compare exception type and value - the rest of
                  # the traceback isn't necessary.