mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-92336: linecache.getline should not raise exceptions on decoding errors (GH-94410)

Browse source
This commit is contained in:
Irit Katriel 2022-06-30 10:18:18 +01:00 • committed by GitHub
parent 68fb03249f
commit 21cbdae90f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/linecache.py
View file

@ -135,7 +135,7 @@ def updatecache(filename, module_globals=None):
try: try:
with tokenize.open(fullname) as fp: with tokenize.open(fullname) as fp:
lines = fp.readlines() lines = fp.readlines()
except OSError: except (OSError, UnicodeDecodeError, SyntaxError):
return [] return []
if lines and not lines[-1].endswith('\n'): if lines and not lines[-1].endswith('\n'):
lines[-1] += '\n' lines[-1] += '\n'

12
Lib/test/test_linecache.py
View file

@ -73,12 +73,10 @@ class GetLineTestsBadData(TempFile):
# file_byte_string = b'Bad data goes here' # file_byte_string = b'Bad data goes here'
def test_getline(self): def test_getline(self):
self.assertRaises((SyntaxError, UnicodeDecodeError), self.assertEqual(linecache.getline(self.file_name, 1), '')
linecache.getline, self.file_name, 1)
def test_getlines(self): def test_getlines(self):
self.assertRaises((SyntaxError, UnicodeDecodeError), self.assertEqual(linecache.getlines(self.file_name), [])
linecache.getlines, self.file_name)
class EmptyFile(GetLineTestsGoodData, unittest.TestCase): class EmptyFile(GetLineTestsGoodData, unittest.TestCase):
@ -92,9 +90,11 @@ class SingleEmptyLine(GetLineTestsGoodData, unittest.TestCase):
class GoodUnicode(GetLineTestsGoodData, unittest.TestCase): class GoodUnicode(GetLineTestsGoodData, unittest.TestCase):
file_list = ['á\n', 'b\n', 'abcdef\n', 'ááááá\n'] file_list = ['á\n', 'b\n', 'abcdef\n', 'ááááá\n']
class BadUnicode_NoDeclaration(GetLineTestsBadData, unittest.TestCase):
file_byte_string = b'\n\x80abc'
class BadUnicode(GetLineTestsBadData, unittest.TestCase): class BadUnicode_WithDeclaration(GetLineTestsBadData, unittest.TestCase):
file_byte_string = b'\x80abc' file_byte_string = b'# coding=utf-8\n\x80abc'
class LineCacheTests(unittest.TestCase): class LineCacheTests(unittest.TestCase):

1
Misc/NEWS.d/next/Library/2022-06-29-09-48-37.gh-issue-92336.otA6c6.rst Normal file
View file

@ -0,0 +1 @@
Fix bug where :meth:`linecache.getline` fails on bad files with :exc:`UnicodeDecodeError` or :exc:`SyntaxError`. It now returns an empty string as per the documentation.