Merge trunk up to 43069, putting re.py back and hopefully making the branch

usable again.
This commit is contained in:
Thomas Wouters 2006-04-21 09:47:09 +00:00
parent 725ccd1810
commit 9ada3d6e29
5 changed files with 7 additions and 6 deletions

View file

@ -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