summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-08-13 05:33:29 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-08-13 05:33:29 (GMT)
commit3672c4e21f4a886306070512354443f229c5cd0e (patch)
tree86e58179f6f44d607f3f446bb4afc2d045987691
parent478267f9c45c912a8f44d58684aa53d783c21c34 (diff)
parent963e40256a7047c538eca88a792710c2d6d53ac5 (diff)
downloadcpython-3672c4e21f4a886306070512354443f229c5cd0e.zip
cpython-3672c4e21f4a886306070512354443f229c5cd0e.tar.gz
cpython-3672c4e21f4a886306070512354443f229c5cd0e.tar.bz2
merge 3.2
-rw-r--r--Lib/test/test_tokenize.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index d30d5ee..9e9656c 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -520,6 +520,9 @@ pass the '-ucpu' option to process the full directory.
>>> 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)
...