[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/6ff43efb8d55
changeset:   71854:6ff43efb8d55
parent:      71852:9b852ceb8858
parent:      71853:c13abed5d764
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Aug 13 00:33:29 2011 -0500
summary:
  merge 3.2

files:
  Lib/test/test_tokenize.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -520,6 +520,9 @@
     >>> tempdir = os.path.dirname(f) or os.curdir
     >>> testfiles = glob.glob(os.path.join(tempdir, "test*.py"))
 
+tokenize is broken on test_pep3131.py because regular expressions are broken on
+the obscure unicode identifiers in it. *sigh*
+    >>> testfiles.remove(os.path.join(tempdir, "test_pep3131.py"))
     >>> if not support.is_resource_enabled("cpu"):
     ...     testfiles = random.sample(testfiles, 10)
     ...

-- 
Repository URL: http://hg.python.org/cpython