From: Andrew M. Kuchling <amk@amk.ca>
Date: Thu, 24 Apr 2003 17:22:04 +0000 (+0000)
Subject: Modernize the code a bit:
X-Git-Tag: v2.3c1~1022
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b12d9d0d24550c866fa9c600efe8024f4681fa4;p=python

Modernize the code a bit:
   use re module
   make chomp() use rstrip()
---

diff --git a/Demo/comparisons/regextest.py b/Demo/comparisons/regextest.py
index e4e18d6d58..fbc5f6c6eb 100755
--- a/Demo/comparisons/regextest.py
+++ b/Demo/comparisons/regextest.py
@@ -18,15 +18,12 @@
 
 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()