Visitar URL original
gh-96268: Fix loading invalid UTF-8 by mdboom · Pull Request #96270 · python/cpython · GitHub
Skip to content

gh-96268: Fix loading invalid UTF-8 #96270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 11 commits into from
Sep 7, 2022
Merged

gh-96268: Fix loading invalid UTF-8 #96270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e4aaa14
gh-96268: Fix loading invalid UTF-8
mdboom Aug 25, 2022
407eef7
Add blurb
mdboom Aug 25, 2022
e453819
Merge remote-tracking branch 'upstream/main' into fix-valid-utf8
mdboom Aug 25, 2022
3d60ff7
Fix blurb
mdboom Aug 25, 2022
5cc57ad
Use assertIn instead
mdboom Aug 25, 2022
ad4de7a
Fix reference to other decoding function
mdboom Aug 31, 2022
18927b1
Fix coding style
mdboom Aug 31, 2022
f741a9d
Add comments about handled code ranges in each branch
mdboom Aug 31, 2022
f8e9e6e
Fix line number in error message
mdboom Aug 31, 2022
ace4a8c
Remove obsolete comment
mdboom Sep 6, 2022
df074a8
PEP7
mdboom Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix line number in error message
  • Loading branch information
@mdboom
mdboom committed Aug 31, 2022
commit f8e9e6eb33ff4695b64c77fb8740553ff7ce67d4
2 changes: 1 addition & 1 deletion Lib/test/test_source_encoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ def check(content):
# not via a signal.
self.assertGreaterEqual(rc, 1)
self.assertIn(b"Non-UTF-8 code starting with", stderr)
self.assertIn(b"on line 5", stderr)
self.assertIn(b"on line 4", stderr)

# continuation bytes in a sequence of 2, 3, or 4 bytes
continuation_bytes = [bytes([x]) for x in range(0x80, 0xC0)]
Expand Down
2 changes: 1 addition & 1 deletion Parser/tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ ensure_utf8(char *line, struct tok_state *tok)
"in file %U on line %i, "
"but no encoding declared; "
"see https://peps.python.org/pep-0263/ for details",
badchar, tok->filename, tok->lineno + 1);
badchar, tok->filename, tok->lineno);
return 0;
}
return 1;
Expand Down