[Python-checkins] CVS: python/dist/src/Lib tokenize.py,1.17,1.18

Eric S. Raymond esr@users.sourceforge.net
Fri, 09 Feb 2001 03:06:40 -0800


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

Modified Files:
	tokenize.py 
Log Message:
String method conversion.


Index: tokenize.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/tokenize.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** tokenize.py	2001/01/15 22:04:30	1.17
--- tokenize.py	2001/02/09 11:06:38	1.18
***************
*** 27,31 ****
  # Note: to quote a backslash in a regex, it must be doubled in a r'aw' string.
  
! def group(*choices): return '(' + string.join(choices, '|') + ')'
  def any(*choices): return apply(group, choices) + '*'
  def maybe(*choices): return apply(group, choices) + '?'
--- 27,31 ----
  # Note: to quote a backslash in a regex, it must be doubled in a r'aw' string.
  
! def group(*choices): return '(' + '|'.join(choices) + ')'
  def any(*choices): return apply(group, choices) + '*'
  def maybe(*choices): return apply(group, choices) + '?'