mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
gh-92336: linecache.getline should not raise exceptions on decoding errors (GH-94410)
This commit is contained in:
parent
68fb03249f
commit
21cbdae90f
|
@ -135,7 +135,7 @@ def updatecache(filename, module_globals=None):
|
|||
try:
|
||||
with tokenize.open(fullname) as fp:
|
||||
lines = fp.readlines()
|
||||
except OSError:
|
||||
except (OSError, UnicodeDecodeError, SyntaxError):
|
||||
return []
|
||||
if lines and not lines[-1].endswith('\n'):
|
||||
lines[-1] += '\n'
|
||||
|
|
|
@ -73,12 +73,10 @@ class GetLineTestsBadData(TempFile):
|
|||
# file_byte_string = b'Bad data goes here'
|
||||
|
||||
def test_getline(self):
|
||||
self.assertRaises((SyntaxError, UnicodeDecodeError),
|
||||
linecache.getline, self.file_name, 1)
|
||||
self.assertEqual(linecache.getline(self.file_name, 1), '')
|
||||
|
||||
def test_getlines(self):
|
||||
self.assertRaises((SyntaxError, UnicodeDecodeError),
|
||||
linecache.getlines, self.file_name)
|
||||
self.assertEqual(linecache.getlines(self.file_name), [])
|
||||
|
||||
|
||||
class EmptyFile(GetLineTestsGoodData, unittest.TestCase):
|
||||
|
@ -92,9 +90,11 @@ class SingleEmptyLine(GetLineTestsGoodData, unittest.TestCase):
|
|||
class GoodUnicode(GetLineTestsGoodData, unittest.TestCase):
|
||||
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):
|
||||
file_byte_string = b'\x80abc'
|
||||
class BadUnicode_WithDeclaration(GetLineTestsBadData, unittest.TestCase):
|
||||
file_byte_string = b'# coding=utf-8\n\x80abc'
|
||||
|
||||
|
||||
class LineCacheTests(unittest.TestCase):
|
||||
|
|
|
@ -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.
|
Loading…
Reference in a new issue