[Python-checkins] cpython (3.4): Issue #23838: linecache now clears the cache and returns an empty result on
serhiy.storchaka
python-checkins at python.org
Wed Apr 1 15:59:07 CEST 2015
https://hg.python.org/cpython/rev/88a0e6cd93c3
changeset: 95345:88a0e6cd93c3
branch: 3.4
parent: 95341:8987218adc99
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Apr 01 16:54:05 2015 +0300
summary:
Issue #23838: linecache now clears the cache and returns an empty result on
MemoryError.
files:
Lib/linecache.py | 6 +++++-
Lib/test/test_linecache.py | 19 ++++++++++++++++---
Misc/NEWS | 3 +++
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Lib/linecache.py b/Lib/linecache.py
--- a/Lib/linecache.py
+++ b/Lib/linecache.py
@@ -37,8 +37,12 @@
if filename in cache:
return cache[filename][2]
- else:
+
+ try:
return updatecache(filename, module_globals)
+ except MemoryError:
+ clearcache()
+ return []
def checkcache(filename=None):
diff --git a/Lib/test/test_linecache.py b/Lib/test/test_linecache.py
--- a/Lib/test/test_linecache.py
+++ b/Lib/test/test_linecache.py
@@ -126,8 +126,21 @@
self.assertEqual(line, getline(source_name, index + 1))
source_list.append(line)
-def test_main():
- support.run_unittest(LineCacheTests)
+ 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)
+
+ 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()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@
Library
-------
+- Issue #23838: linecache now clears the cache and returns an empty result on
+ MemoryError.
+
- Issue #18473: Fixed 2to3 and 3to2 compatible pickle mappings. Fixed
ambigious reverse mappings. Added many new mappings. Import mapping is no
longer applied to modules already mapped with full name mapping.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list