#2650: Merge with 3.1.

diff --cc Lib/re.py
Simple merge

diff --cc Lib/test/test_re.py
index e4b33c9ae5bab3a59ee65c7a7f83e9a85ad76b5d,5ad44dd28bd3ac8bb7b9a396da0804985066e210..fe8bc3403947981ac9618fba2f28b2b979b2ab42
--- 1/Lib/test/test_re.py
--- 2/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@@ -1,7 -1,10 +1,9 @@@
  from test.support import verbose, run_unittest
  import re
  from re import Scanner
- import sys, traceback
 -import os
+ import sys
+ import string
+ import traceback
  from weakref import proxy
  
  # Misc tests from Tim Peters' re.doc