ensure the last line has a trailing newline #8782

This commit is contained in:
Benjamin Peterson 2010-05-21 21:31:24 +00:00
parent dd59f1bf92
commit 266e454866
3 changed files with 17 additions and 0 deletions

View File

@ -133,6 +133,8 @@ def updatecache(filename, module_globals=None):
except IOError, msg:
## print '*** Cannot open', fullname, ':', msg
return []
if lines and not lines[-1].endswith('\n'):
lines[-1] += '\n'
size, mtime = stat.st_size, stat.st_mtime
cache[filename] = size, mtime, lines, fullname
return lines

View File

@ -31,6 +31,11 @@ a = f()
'''
SOURCE_3 = '''
def f():
return 3''' # No ending newline
class LineCacheTests(unittest.TestCase):
def test_getline(self):
@ -63,6 +68,13 @@ class LineCacheTests(unittest.TestCase):
empty = linecache.getlines('a/b/c/__init__.py')
self.assertEquals(empty, [])
def test_no_ending_newline(self):
self.addCleanup(support.unlink, support.TESTFN)
with open(support.TESTFN, "w") as fp:
fp.write(SOURCE_3)
lines = linecache.getlines(support.TESTFN)
self.assertEqual(lines, ["\n", "def f():\n", " return 3\n"])
def test_clearcache(self):
cached = []
for entry in TESTS:

View File

@ -29,6 +29,9 @@ C-API
Library
-------
- Issue #8782: Add a trailing newline in linecache.updatecache to the last line
of files without one.
- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when
comparing to a non-mapping.