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
22d9ee7e
Commit
22d9ee7e
authored
Dec 28, 2013
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
complain if the codec doesn't return unicode
parent
63cc99d9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
0 deletions
+16
-0
Lib/test/bad_coding3.py
Lib/test/bad_coding3.py
+2
-0
Lib/test/test_pep263.py
Lib/test/test_pep263.py
+5
-0
Misc/NEWS
Misc/NEWS
+3
-0
Parser/tokenizer.c
Parser/tokenizer.c
+6
-0
No files found.
Lib/test/bad_coding3.py
0 → 100644
View file @
22d9ee7e
# coding: string-escape
\
x70
\
x72
\
x69
\
x6e
\
x74
\
x20
\
x32
\
x2b
\
x32
\
x0a
Lib/test/test_pep263.py
View file @
22d9ee7e
...
...
@@ -58,6 +58,11 @@ class PEP263Test(unittest.TestCase):
with
self
.
assertRaisesRegexp
(
SyntaxError
,
'BOM'
):
compile
(
'
\
xef
\
xbb
\
xbf
# -*- coding: fake -*-
\
n
'
,
'dummy'
,
'exec'
)
def
test_non_unicode_codec
(
self
):
with
self
.
assertRaisesRegexp
(
SyntaxError
,
'codec did not return a unicode'
):
from
test
import
bad_coding3
def
test_main
():
test_support
.
run_unittest
(
PEP263Test
)
...
...
Misc/NEWS
View file @
22d9ee7e
...
...
@@ -9,6 +9,9 @@ What's New in Python 2.7.7?
Core and Builtins
-----------------
- Raise a better error when non-unicode codecs are used for a file'
s
coding
cookie
.
-
Issue
#
17976
:
Fixed
potential
problem
with
file
.
write
()
not
detecting
IO
error
by
inspecting
the
return
value
of
fwrite
().
Based
on
patches
by
Jaakko
Moisio
and
Victor
Stinner
.
...
...
Parser/tokenizer.c
View file @
22d9ee7e
...
...
@@ -400,6 +400,12 @@ fp_readl(char *s, int size, struct tok_state *tok)
buf
=
PyObject_CallObject
(
tok
->
decoding_readline
,
NULL
);
if
(
buf
==
NULL
)
return
error_ret
(
tok
);
if
(
!
PyUnicode_Check
(
buf
))
{
Py_DECREF
(
buf
);
PyErr_SetString
(
PyExc_SyntaxError
,
"codec did not return a unicode object"
);
return
error_ret
(
tok
);
}
}
else
{
tok
->
decoding_buffer
=
NULL
;
if
(
PyString_CheckExact
(
buf
))
...
...
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