diff options
author | Guido van Rossum <guido@python.org> | 1998-03-26 19:42:58 (GMT) |
---|---|---|
committer | Guido van Rossum <guido@python.org> | 1998-03-26 19:42:58 (GMT) |
commit | 41360a4696f488e49e5409b3b1baf1fff6ae0044 (patch) | |
tree | 9c9b73b7446cc9fc36e09038bf26d889bb5b6f24 /Lib/test/test_regex.py | |
parent | cd0f59ea0824ad6f897f05c2db4d4471e47e6063 (diff) | |
download | cpython-41360a4696f488e49e5409b3b1baf1fff6ae0044.zip cpython-41360a4696f488e49e5409b3b1baf1fff6ae0044.tar.gz cpython-41360a4696f488e49e5409b3b1baf1fff6ae0044.tar.bz2 |
Mass check-in after untabifying all files that need it.
Diffstat (limited to 'Lib/test/test_regex.py')
-rw-r--r-- | Lib/test/test_regex.py | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/Lib/test/test_regex.py b/Lib/test/test_regex.py index 4be6026..6a7f01b 100644 --- a/Lib/test/test_regex.py +++ b/Lib/test/test_regex.py @@ -67,44 +67,44 @@ if verbose: print 'Running regex_tests test suite' for t in tests: pattern=s=outcome=repl=expected=None if len(t)==5: - pattern, s, outcome, repl, expected = t + pattern, s, outcome, repl, expected = t elif len(t)==3: - pattern, s, outcome = t + pattern, s, outcome = t else: - raise ValueError, ('Test tuples should have 3 or 5 fields',t) + raise ValueError, ('Test tuples should have 3 or 5 fields',t) try: - obj=regex.compile(pattern) + obj=regex.compile(pattern) except regex.error: - if outcome==SYNTAX_ERROR: pass # Expected a syntax error - else: - # Regex syntax errors aren't yet reported, so for - # the official test suite they'll be quietly ignored. - pass - #print '=== Syntax error:', t + if outcome==SYNTAX_ERROR: pass # Expected a syntax error + else: + # Regex syntax errors aren't yet reported, so for + # the official test suite they'll be quietly ignored. + pass + #print '=== Syntax error:', t else: - try: - result=obj.search(s) - except regex.error, msg: - print '=== Unexpected exception', t, repr(msg) - if outcome==SYNTAX_ERROR: - # This should have been a syntax error; forget it. - pass - elif outcome==FAIL: - if result==-1: pass # No match, as expected - else: print '=== Succeeded incorrectly', t - elif outcome==SUCCEED: - if result!=-1: - # Matched, as expected, so now we compute the - # result string and compare it to our expected result. - start, end = obj.regs[0] - found=s[start:end] - groups=obj.group(1,2,3,4,5,6,7,8,9,10) - vardict=vars() - for i in range(len(groups)): - vardict['g'+str(i+1)]=str(groups[i]) - repl=eval(repl) - if repl!=expected: - print '=== grouping error', t, repr(repl)+' should be '+repr(expected) - else: - print '=== Failed incorrectly', t + try: + result=obj.search(s) + except regex.error, msg: + print '=== Unexpected exception', t, repr(msg) + if outcome==SYNTAX_ERROR: + # This should have been a syntax error; forget it. + pass + elif outcome==FAIL: + if result==-1: pass # No match, as expected + else: print '=== Succeeded incorrectly', t + elif outcome==SUCCEED: + if result!=-1: + # Matched, as expected, so now we compute the + # result string and compare it to our expected result. + start, end = obj.regs[0] + found=s[start:end] + groups=obj.group(1,2,3,4,5,6,7,8,9,10) + vardict=vars() + for i in range(len(groups)): + vardict['g'+str(i+1)]=str(groups[i]) + repl=eval(repl) + if repl!=expected: + print '=== grouping error', t, repr(repl)+' should be '+repr(expected) + else: + print '=== Failed incorrectly', t |