test_sre is dead! long live test_re!
diff --git a/Lib/test/test_sre.py b/Lib/test/test_sre.py
deleted file mode 100644
index 982cad9..0000000
--- a/Lib/test/test_sre.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# SRE test harness for the Python regression suite
-
-# this is based on test_re.py, but uses a test function instead
-# of all those asserts
-
-import sys
-sys.path=['.']+sys.path
-
-from test.test_support import verbose, TestFailed, have_unicode
-import sre
-import sys, os, string, traceback
-
-#
-# test support
-
-def test(expression, result, exception=None):
- try:
- r = eval(expression)
- except:
- if exception:
- if not isinstance(sys.exc_value, exception):
- print expression, "FAILED"
- # display name, not actual value
- if exception is sre.error:
- print "expected", "sre.error"
- else:
- print "expected", exception.__name__
- print "got", sys.exc_type.__name__, str(sys.exc_value)
- else:
- print expression, "FAILED"
- traceback.print_exc(file=sys.stdout)
- else:
- if exception:
- print expression, "FAILED"
- if exception is sre.error:
- print "expected", "sre.error"
- else:
- print "expected", exception.__name__
- print "got result", repr(r)
- else:
- if r != result:
- print expression, "FAILED"
- print "expected", repr(result)
- print "got result", repr(r)
-
-if verbose:
- print 'Running tests on character literals'
-
-#
-# Misc tests from Tim Peters' re.doc
-
-if verbose:
- print 'Running tests on sre.search and sre.match'
-
-test(r"""sre.search(r'x*', 'axx').span(0)""", (0, 0))
-test(r"""sre.search(r'x*', 'axx').span()""", (0, 0))
-test(r"""sre.search(r'x+', 'axx').span(0)""", (1, 3))
-test(r"""sre.search(r'x+', 'axx').span()""", (1, 3))
-test(r"""sre.search(r'x', 'aaa')""", None)
-
-test(r"""sre.match(r'a*', 'xxx').span(0)""", (0, 0))
-test(r"""sre.match(r'a*', 'xxx').span()""", (0, 0))
-test(r"""sre.match(r'x*', 'xxxa').span(0)""", (0, 3))
-test(r"""sre.match(r'x*', 'xxxa').span()""", (0, 3))
-test(r"""sre.match(r'a+', 'xxx')""", None)
-
-if verbose:
- print "Running tests on sre.findall"
-
-test(r"""sre.findall(r":+", "abc")""", [])
-test(r"""sre.findall(r":+", "a:b::c:::d")""", [":", "::", ":::"])
-test(r"""sre.findall(r"(:+)", "a:b::c:::d")""", [":", "::", ":::"])
-test(r"""sre.findall(r"(:)(:*)", "a:b::c:::d")""",
- [(":", ""), (":", ":"), (":", "::")])
-test(r"""sre.findall(r"(a)|(b)", "abc")""", [("a", ""), ("", "b")])
-
-# bug 117612
-test(r"""sre.findall(r"(a|(b))", "aba")""", [("a", ""),("b", "b"),("a", "")])
-
-if sys.hexversion >= 0x02020000:
- if verbose:
- print "Running tests on sre.finditer"
- def fixup(seq):
- # convert iterator to list
- if not hasattr(seq, "next") or not hasattr(seq, "__iter__"):
- print "finditer returned", type(seq)
- return map(lambda item: item.group(0), seq)
- # sanity
- test(r"""fixup(sre.finditer(r":+", "a:b::c:::d"))""", [":", "::", ":::"])
-
-if verbose:
- print "Running tests on sre.match"
-
-test(r"""sre.match(r'a', 'a').groups()""", ())
-test(r"""sre.match(r'(a)', 'a').groups()""", ('a',))
-test(r"""sre.match(r'(a)', 'a').group(0)""", 'a')
-test(r"""sre.match(r'(a)', 'a').group(1)""", 'a')
-test(r"""sre.match(r'(a)', 'a').group(1, 1)""", ('a', 'a'))
-
-pat = sre.compile(r'((a)|(b))(c)?')
-test(r"""pat.match('a').groups()""", ('a', 'a', None, None))
-test(r"""pat.match('b').groups()""", ('b', None, 'b', None))
-test(r"""pat.match('ac').groups()""", ('a', 'a', None, 'c'))
-test(r"""pat.match('bc').groups()""", ('b', None, 'b', 'c'))
-test(r"""pat.match('bc').groups("")""", ('b', "", 'b', 'c'))
-
-pat = sre.compile(r'(?:(?P<a1>a)|(?P<b2>b))(?P<c3>c)?')
-test(r"""pat.match('a').group(1, 2, 3)""", ('a', None, None))
-test(r"""pat.match('b').group('a1', 'b2', 'c3')""", (None, 'b', None))
-test(r"""pat.match('ac').group(1, 'b2', 3)""", ('a', None, 'c'))
-
-# bug 448951 (similar to 429357, but with single char match)
-# (Also test greedy matches.)
-for op in '','?','*':
- test(r"""sre.match(r'((.%s):)?z', 'z').groups()"""%op, (None, None))
- test(r"""sre.match(r'((.%s):)?z', 'a:z').groups()"""%op, ('a:', 'a'))