[Python-checkins] python/dist/src/Lib doctest.py,1.58,1.59

[edloper at users.sourceforge.net]

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

Modified Files:
	doctest.py 
Log Message:
- Added a register_optionflag function (so users can add their own
  option flags); and use it to define the existing optionflag
  constants.


Index: doctest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/doctest.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** doctest.py	10 Aug 2004 01:41:28 -0000	1.58
--- doctest.py	12 Aug 2004 02:02:24 -0000	1.59
***************
*** 194,219 ****
  real_pdb_set_trace = pdb.set_trace
  
- # Option constants.
- DONT_ACCEPT_TRUE_FOR_1 = 1 << 0
- DONT_ACCEPT_BLANKLINE = 1 << 1
- NORMALIZE_WHITESPACE = 1 << 2
- ELLIPSIS = 1 << 3
- UNIFIED_DIFF = 1 << 4
- CONTEXT_DIFF = 1 << 5
- 
- OPTIONFLAGS_BY_NAME = {
-     'DONT_ACCEPT_TRUE_FOR_1': DONT_ACCEPT_TRUE_FOR_1,
-     'DONT_ACCEPT_BLANKLINE': DONT_ACCEPT_BLANKLINE,
-     'NORMALIZE_WHITESPACE': NORMALIZE_WHITESPACE,
-     'ELLIPSIS': ELLIPSIS,
-     'UNIFIED_DIFF': UNIFIED_DIFF,
-     'CONTEXT_DIFF': CONTEXT_DIFF,
-     }
- 
- # Special string markers for use in `want` strings:
- BLANKLINE_MARKER = '<BLANKLINE>'
- ELLIPSIS_MARKER = '...'
- 
- 
  # There are 4 basic classes:
  #  - Example: a <source, want> pair, plus an intra-docstring line number.
--- 194,197 ----
***************
*** 235,238 ****
--- 213,234 ----
  #                            +---------+
  
+ # Option constants.
+ OPTIONFLAGS_BY_NAME = {}
+ def register_optionflag(name):
+     flag = 1 << len(OPTIONFLAGS_BY_NAME)
+     OPTIONFLAGS_BY_NAME[name] = flag
+     return flag
+ 
+ DONT_ACCEPT_TRUE_FOR_1 = register_optionflag('DONT_ACCEPT_TRUE_FOR_1')
+ DONT_ACCEPT_BLANKLINE = register_optionflag('DONT_ACCEPT_BLANKLINE')
+ NORMALIZE_WHITESPACE = register_optionflag('NORMALIZE_WHITESPACE')
+ ELLIPSIS = register_optionflag('ELLIPSIS')
+ UNIFIED_DIFF = register_optionflag('UNIFIED_DIFF')
+ CONTEXT_DIFF = register_optionflag('CONTEXT_DIFF')
+ 
+ # Special string markers for use in `want` strings:
+ BLANKLINE_MARKER = '<BLANKLINE>'
+ ELLIPSIS_MARKER = '...'
+ 
  ######################################################################
  ## Table of Contents