From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 25 Mar 2011 12:25:36 +0000 (+0200)
Subject: #2650: Merge with 3.1.
X-Git-Tag: v3.2.1b1~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=213eb96902387dd1f5af0f5f1b80f3d227fd0186;p=thirdparty%2FPython%2Fcpython.git

#2650: Merge with 3.1.
---

213eb96902387dd1f5af0f5f1b80f3d227fd0186
diff --cc Lib/test/test_re.py
index e4b33c9ae5ba,5ad44dd28bd3..fe8bc3403947
--- a/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