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
a5b4ea15
Commit
a5b4ea15
authored
Aug 25, 2017
by
Oren Milman
Committed by
Serhiy Storchaka
Aug 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-31271: Fix an assertion failure in io.TextIOWrapper.write. (#3201)
parent
dce65020
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
0 deletions
+17
-0
Lib/test/test_io.py
Lib/test/test_io.py
+8
-0
Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
...ore and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
+2
-0
Modules/_io/textio.c
Modules/_io/textio.c
+7
-0
No files found.
Lib/test/test_io.py
View file @
a5b4ea15
...
...
@@ -3225,6 +3225,14 @@ class TextIOWrapperTest(unittest.TestCase):
t
=
self
.
TextIOWrapper
(
self
.
StringIO
(
'a'
))
self
.
assertRaises
(
TypeError
,
t
.
read
)
def
test_illegal_encoder
(
self
):
# Issue 31271: Calling write() while the return value of encoder's
# encode() is invalid shouldn't cause an assertion failure.
rot13
=
codecs
.
lookup
(
"rot13"
)
with
support
.
swap_attr
(
rot13
,
'_is_text_encoding'
,
True
):
t
=
io
.
TextIOWrapper
(
io
.
BytesIO
(
b'foo'
),
encoding
=
"rot13"
)
self
.
assertRaises
(
TypeError
,
t
.
write
,
'bar'
)
def
test_illegal_decoder
(
self
):
# Issue #17106
# Bypass the early encoding check added in issue 20404
...
...
Misc/NEWS.d/next/Core and Builtins/2017-08-25-20-43-22.bpo-31271.YMduKF.rst
0 → 100644
View file @
a5b4ea15
Fix an assertion failure in the write() method of `io.TextIOWrapper`, when
the encoder doesn't return a bytes object. Patch by Oren Milman.
Modules/_io/textio.c
View file @
a5b4ea15
...
...
@@ -1387,6 +1387,13 @@ _io_TextIOWrapper_write_impl(textio *self, PyObject *text)
Py_DECREF
(
text
);
if
(
b
==
NULL
)
return
NULL
;
if
(
!
PyBytes_Check
(
b
))
{
PyErr_Format
(
PyExc_TypeError
,
"encoder should return a bytes object, not '%.200s'"
,
Py_TYPE
(
b
)
->
tp_name
);
Py_DECREF
(
b
);
return
NULL
;
}
if
(
self
->
pending_bytes
==
NULL
)
{
self
->
pending_bytes
=
PyList_New
(
0
);
...
...
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