From: Robert Collins <rbtcollins@hp.com>
Date: Wed, 19 Aug 2015 22:48:46 +0000 (+1200)
Subject: Fix test_linecache change.
X-Git-Tag: v3.6.0a1~1750
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4d35dc8b6fb3c071d85e2d8830566876288c180;p=python

Fix test_linecache change.

In non-UTF8 locales open() will have the wrong encoding for the test
data. We need to open the file via tokenize, to get a detected
encoding instead.
---

diff --git a/Lib/test/test_linecache.py b/Lib/test/test_linecache.py
index e74aef3580..240db7f874 100644
--- a/Lib/test/test_linecache.py
+++ b/Lib/test/test_linecache.py
@@ -4,6 +4,7 @@ import linecache
 import unittest
 import os.path
 import tempfile
+import tokenize
 from test import support
 
 
@@ -54,7 +55,7 @@ class GetLineTestsGoodData(TempFile):
         super().setUp()
 
     def test_getline(self):
-        with open(self.file_name) as fp:
+        with tokenize.open(self.file_name) as fp:
             for index, line in enumerate(fp):
                 if not line.endswith('\n'):
                     line += '\n'