diff -r a2df4baa112b Lib/linecache.py --- a/Lib/linecache.py Wed Apr 01 13:06:18 2015 +0300 +++ b/Lib/linecache.py Wed Apr 01 16:20:21 2015 +0300 @@ -40,11 +40,13 @@ def getlines(filename, module_globals=No if filename in cache: entry = cache[filename] - if len(entry) == 1: - return updatecache(filename, module_globals) - return cache[filename][2] - else: + if len(entry) != 1: + return cache[filename][2] + try: return updatecache(filename, module_globals) + except MemoryError: + clearcache() + return [] def checkcache(filename=None): diff -r a2df4baa112b Lib/test/test_linecache.py --- a/Lib/test/test_linecache.py Wed Apr 01 13:06:18 2015 +0300 +++ b/Lib/test/test_linecache.py Wed Apr 01 16:20:21 2015 +0300 @@ -169,9 +169,21 @@ class LineCacheTests(unittest.TestCase): linecache.lazycache(NONEXISTENT_FILENAME, globals())) self.assertEqual(4, len(linecache.cache[NONEXISTENT_FILENAME])) + def test_memoryerror(self): + lines = linecache.getlines(FILENAME) + self.assertTrue(lines) + def raise_memoryerror(*args, **kwargs): + raise MemoryError + with support.swap_attr(linecache, 'updatecache', raise_memoryerror): + lines2 = linecache.getlines(FILENAME) + self.assertEqual(lines2, lines) -def test_main(): - support.run_unittest(LineCacheTests) + linecache.clearcache() + with support.swap_attr(linecache, 'updatecache', raise_memoryerror): + lines3 = linecache.getlines(FILENAME) + self.assertEqual(lines3, []) + self.assertEqual(linecache.getlines(FILENAME), lines) + if __name__ == "__main__": - test_main() + unittest.main()