summaryrefslogtreecommitdiff
path: root/Demo
diff options
context:
space:
mode:
authorAndrew M. Kuchling <amk@amk.ca>2003-04-24 17:22:04 +0000
committerAndrew M. Kuchling <amk@amk.ca>2003-04-24 17:22:04 +0000
commit50800cd9485915dd4fb8a04609f8ba4c730e166a (patch)
tree85df7a55d9d14cee1de17dc6b95f602d1a482cc1 /Demo
parentf5f6df4ae07ad5b51ff8335a6d65459c437f03dd (diff)
downloadcpython-50800cd9485915dd4fb8a04609f8ba4c730e166a.tar.gz
Modernize the code a bit:
use re module make chomp() use rstrip()
Diffstat (limited to 'Demo')
-rwxr-xr-xDemo/comparisons/regextest.py14
1 files changed, 5 insertions, 9 deletions
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()