[Python-checkins] python/dist/src/Lib doctest.py,1.38,1.39

[tim_one at users.sourceforge.net]

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

Modified Files:
	doctest.py 
Log Message:
Merging from tim-doctest-branch, which is now closed.
This primarily adds more powerful ways to work with unittest, including
spiffy support for building suites out of doctests in non-Python
"text files".


Index: doctest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** doctest.py	4 Aug 2004 20:04:31 -0000	1.38
--- doctest.py	6 Aug 2004 22:02:59 -0000	1.39
***************
*** 1,5 ****
  # Module doctest.
  # Released to the public domain 16-Jan-2001, by Tim Peters (tim at python.org).
! # Significant enhancements by:
  #     Jim Fulton
  #     Edward Loper
--- 1,5 ----
  # Module doctest.
  # Released to the public domain 16-Jan-2001, by Tim Peters (tim at python.org).
! # Major enhancements and refactoring by:
  #     Jim Fulton
[...1135 lines suppressed...]
  
  def debug(module, name, pm=False):
!     """Debug a single doctest test doc string
  
      Provide the module (or dotted name of the module) containing the
      test to be debugged and the name (within the module) of the object
!     with the doc string with tests to be debugged.
! 
      """
      module = _normalize_module(module)
--- 2303,2311 ----
  
  def debug(module, name, pm=False):
!     """Debug a single doctest docstring.
  
      Provide the module (or dotted name of the module) containing the
      test to be debugged and the name (within the module) of the object
!     with the docstring with tests to be debugged.
      """
      module = _normalize_module(module)