From: Ned Deily <nad@acm.org>
Date: Tue, 19 Jul 2011 23:15:27 +0000 (-0700)
Subject: Issue #12587: Correct faulty test file and reference in test_tokenize.
X-Git-Tag: v3.2.2rc1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ea6fccf64596f84562b0a57a8d63847286bdf4c;p=thirdparty%2FPython%2Fcpython.git

Issue #12587: Correct faulty test file and reference in test_tokenize.
(Patch by Robert Xiao)
---

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 11e6fb459657..d30d5eed094c 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 d8e6c803d5a3..04561e48472e 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 ccbe152f6f9a..9ac162f8fbf4 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 3cb654c9c80f..590166a05b8d 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.