summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-07-19 23:15:27 (GMT)
committerNed Deily <nad@acm.org>2011-07-19 23:15:27 (GMT)
commit2ea6fccf64596f84562b0a57a8d63847286bdf4c (patch)
treec8951e316d506a6a3cfd5a5cb990b7594acc114d
parentc57ed91e0c1e5476076268e62a85b613ef88d21b (diff)
downloadcpython-2ea6fccf64596f84562b0a57a8d63847286bdf4c.zip
cpython-2ea6fccf64596f84562b0a57a8d63847286bdf4c.tar.gz
cpython-2ea6fccf64596f84562b0a57a8d63847286bdf4c.tar.bz2
Issue #12587: Correct faulty test file and reference in test_tokenize.
(Patch by Robert Xiao)
-rw-r--r--Lib/test/test_tokenize.py2
-rw-r--r--Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt2
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
4 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 11e6fb4..d30d5ee 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -649,7 +649,7 @@ class TestTokenizerAdheresToPep0263(TestCase):
return roundtrip(open(path, 'rb'))
def test_utf8_coding_cookie_and_no_utf8_bom(self):
- f = 'tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt'
+ f = 'tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt'
self.assertTrue(self._testFile(f))
def test_latin1_coding_cookie_and_utf8_bom(self):
diff --git a/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt b/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
index d8e6c80..04561e4 100644
--- a/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
+++ b/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
# IMPORTANT: unlike the other test_tokenize-*.txt files, this file
# does NOT have the utf-8 BOM signature '\xef\xbb\xbf' at the start
# of it. Make sure this is not added inadvertently by your editor
diff --git a/Misc/ACKS b/Misc/ACKS
index ccbe152..9ac162f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -973,6 +973,7 @@ Gordon Worley
Thomas Wouters
Heiko Wundram
Doug Wyatt
+Robert Xiao
Florent Xicluna
Hirokazu Yamamoto
Ka-Ping Yee
diff --git a/Misc/NEWS b/Misc/NEWS
index 3cb654c..590166a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@ C-API
Tests
-----
+- Issue #12587: Correct faulty test file and reference in test_tokenize.
+ (Patch by Robert Xiao)
+
- Try harder to reap dangling threads in test.support.reap_threads().
- Issue #12573: Add resource checks for dangling Thread and Process objects.