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
af62c7d3
Commit
af62c7d3
authored
May 25, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Plain Diff
(Merge 3.2) Issue #12175: FileIO.readall() now raises a ValueError instead of
an IOError if the file is closed.
parents
fd821137
4767114e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
0 deletions
+7
-0
Lib/test/test_io.py
Lib/test/test_io.py
+2
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_io/fileio.c
Modules/_io/fileio.c
+2
-0
No files found.
Lib/test/test_io.py
View file @
af62c7d3
...
...
@@ -2512,6 +2512,8 @@ class MiscIOTest(unittest.TestCase):
self
.
assertRaises
(
ValueError
,
f
.
read
)
if
hasattr
(
f
,
"read1"
):
self
.
assertRaises
(
ValueError
,
f
.
read1
,
1024
)
if
hasattr
(
f
,
"readall"
):
self
.
assertRaises
(
ValueError
,
f
.
readall
)
if
hasattr
(
f
,
"readinto"
):
self
.
assertRaises
(
ValueError
,
f
.
readinto
,
bytearray
(
1024
))
self
.
assertRaises
(
ValueError
,
f
.
readline
)
...
...
Misc/NEWS
View file @
af62c7d3
...
...
@@ -1062,6 +1062,9 @@ Core and Builtins
Library
-------
- Issue #12175: FileIO.readall() now raises a ValueError instead of an IOError
if the file is closed.
- Issue #10916: mmap should not segfault when a file is mapped using 0 as length
and a non-zero offset, and an attempt to read past the end of file is made
(IndexError is raised instead). Patch by Ross Lagerwall.
...
...
Modules/_io/fileio.c
View file @
af62c7d3
...
...
@@ -583,6 +583,8 @@ fileio_readall(fileio *self)
Py_ssize_t
total
=
0
;
int
n
;
if
(
self
->
fd
<
0
)
return
err_closed
();
if
(
!
_PyVerify_fd
(
self
->
fd
))
return
PyErr_SetFromErrno
(
PyExc_IOError
);
...
...
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