Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c512adc9
Commit
c512adc9
authored
Apr 01, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23838: linecache now clears the cache and returns an empty result on
MemoryError.
parent
263dcd20
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
Lib/linecache.py
Lib/linecache.py
+5
-1
Lib/test/test_linecache.py
Lib/test/test_linecache.py
+16
-3
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/linecache.py
View file @
c512adc9
...
...
@@ -37,8 +37,12 @@ def getlines(filename, module_globals=None):
if
filename
in
cache
:
return
cache
[
filename
][
2
]
else
:
try
:
return
updatecache
(
filename
,
module_globals
)
except
MemoryError
:
clearcache
()
return
[]
def
checkcache
(
filename
=
None
):
...
...
Lib/test/test_linecache.py
View file @
c512adc9
...
...
@@ -126,8 +126,21 @@ class LineCacheTests(unittest.TestCase):
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
()
Misc/NEWS
View file @
c512adc9
...
...
@@ -21,6 +21,9 @@ Core and Builtins
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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment