]> granicus.if.org Git - python/commitdiff
Modernize the code a bit:
authorAndrew M. Kuchling <amk@amk.ca>
Thu, 24 Apr 2003 17:22:04 +0000 (17:22 +0000)
committerAndrew M. Kuchling <amk@amk.ca>
Thu, 24 Apr 2003 17:22:04 +0000 (17:22 +0000)
   use re module
   make chomp() use rstrip()

Demo/comparisons/regextest.py

index e4e18d6d581203507e6d6ee0d2deb824c529e13a..fbc5f6c6ebecffff990d2d0c417897429a14d664 100755 (executable)
 
 import string
 import sys
-import regex
-from regex_syntax import *
-
-regex.set_syntax(RE_SYNTAX_EGREP)
+import re
 
 def main():
     pats = map(chomp, sys.stdin.readlines())
-    bigpat = '(' + string.joinfields(pats, '|') + ')'
-    prog = regex.compile(bigpat)
+    bigpat = '(' + '|'.join(pats) + ')'
+    prog = re.compile(bigpat)
 
     for file in sys.argv[1:]:
         try:
@@ -40,11 +37,10 @@ def main():
             if not line:
                 break
             lineno = lineno + 1
-            if prog.search(line) >= 0:
+            if prog.search(line):
                 print "%s:%s:%s" % (file, lineno, line),
 
 def chomp(s):
-    if s[-1:] == '\n': return s[:-1]
-    else: return s
+    return s.rstrip('\n')
 
 main()