diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:47:09 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:47:09 (GMT) |
| commit | 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d (patch) | |
| tree | 19bca246f86e49114613e5c9f08d4ebe637ae480 /Lib/test/test_re.py | |
| parent | 725ccd181020ba04bfeea41078ddb0c82c284c63 (diff) | |
| download | cpython-9ada3d6e29d5165dadacbe6be07bcd35cfbef59d.zip cpython-9ada3d6e29d5165dadacbe6be07bcd35cfbef59d.tar.gz cpython-9ada3d6e29d5165dadacbe6be07bcd35cfbef59d.tar.bz2 | |
Merge trunk up to 43069, putting re.py back and hopefully making the branch
usable again.
Diffstat (limited to 'Lib/test/test_re.py')
| -rw-r--r-- | Lib/test/test_re.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 9755005..14a0acf 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -3,7 +3,7 @@ sys.path = ['.'] + sys.path from test.test_support import verbose, run_unittest import re -from sre import Scanner +from re import Scanner import sys, os, traceback from weakref import proxy |