| commit | 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d | [log] [tgz] |
|---|---|---|
| author | Thomas Wouters <thomas@python.org> | Fri Apr 21 09:47:09 2006 +0000 |
| committer | Thomas Wouters <thomas@python.org> | Fri Apr 21 09:47:09 2006 +0000 |
| tree | 19bca246f86e49114613e5c9f08d4ebe637ae480 | |
| parent | 725ccd181020ba04bfeea41078ddb0c82c284c63 [diff] [blame] |
Merge trunk up to 43069, putting re.py back and hopefully making the branch usable again.
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 @@ 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