[Python-checkins] python/dist/src/Lib doctest.py,1.36,1.37

[tim_one at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16195/Lib

Modified Files:
	doctest.py 
Log Message:
Edward Loper's cool and massive refactoring of doctest.py, merged from
the tim-doctest-merge-24a2 tag on the the tim-doctest-branch branch.
We did development on the branch in case it wouldn't land in time for
2.4a2, but the branch looked good:  Edward's tests passed there, ditto
Python's tests, and ditto the Zope3 tests.  Together, those hit doctest
heavily.


Index: doctest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** doctest.py	14 Jul 2004 19:06:50 -0000	1.36
--- doctest.py	4 Aug 2004 18:46:33 -0000	1.37
***************
*** 1,8 ****
  # Module doctest.
! # Released to the public domain 16-Jan-2001,
! # by Tim Peters (tim.one at home.com).
  
  # Provided as-is; use at your own risk; no warranty; no promises; enjoy!
  
  r"""Module doctest -- a framework for running examples in docstrings.
  
--- 1,11 ----
  # Module doctest.
[...2822 lines suppressed...]
!         >>> t.rundict(m1.__dict__, "rundict_test_pvt")  # None are skipped.
!         (0, 8)
! 
!         The exclusion of objects from outside the designated module is
!         meant to be invoked automagically by testmod.
! 
!         >>> testmod(m1, isprivate=is_private, verbose=False)
!         (0, 3)
! """
  
  def _test():
!     #import doctest
!     #doctest.testmod(doctest, verbose=False,
!     #                optionflags=ELLIPSIS | NORMALIZE_WHITESPACE |
!     #                UNIFIED_DIFF)
!     #print '~'*70
!     r = unittest.TextTestRunner()
!     r.run(DocTestSuite())
  
  if __name__ == "__main__":