[Python-checkins] python/dist/src/Demo/comparisons regextest.py,1.3,1.4

[akuchling@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Demo/comparisons
In directory sc8-pr-cvs1:/tmp/cvs-serv30952

Modified Files:
	regextest.py 
Log Message:
Modernize the code a bit:
   use re module
   make chomp() use rstrip()


Index: regextest.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/comparisons/regextest.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** regextest.py	24 Apr 2003 17:13:17 -0000	1.3
--- regextest.py	24 Apr 2003 17:22:04 -0000	1.4
***************
*** 19,31 ****
  import string
  import sys
! import regex
! from regex_syntax import *
! 
! regex.set_syntax(RE_SYNTAX_EGREP)
  
  def main():
      pats = map(chomp, sys.stdin.readlines())
!     bigpat = '(' + string.joinfields(pats, '|') + ')'
!     prog = regex.compile(bigpat)
  
      for file in sys.argv[1:]:
--- 19,28 ----
  import string
  import sys
! import re
  
  def main():
      pats = map(chomp, sys.stdin.readlines())
!     bigpat = '(' + '|'.join(pats) + ')'
!     prog = re.compile(bigpat)
  
      for file in sys.argv[1:]:
***************
*** 41,50 ****
                  break
              lineno = lineno + 1
!             if prog.search(line) >= 0:
                  print "%s:%s:%s" % (file, lineno, line),
  
  def chomp(s):
!     if s[-1:] == '\n': return s[:-1]
!     else: return s
  
  main()
--- 38,46 ----
                  break
              lineno = lineno + 1
!             if prog.search(line):
                  print "%s:%s:%s" % (file, lineno, line),
  
  def chomp(s):
!     return s.rstrip('\n')
  
  main()