From 9ada3d6e29d5165dadacbe6be07bcd35cfbef59d Mon Sep 17 00:00:00 2001 From: Thomas Wouters Date: Fri, 21 Apr 2006 09:47:09 +0000 Subject: Merge trunk up to 43069, putting re.py back and hopefully making the branch usable again. --- Lib/test/test_re.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Lib/test/test_re.py') diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 9755005f11..14a0acfc6b 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 -- cgit v1.2.1