mirror of
https://github.com/python/cpython.git
synced 2025-11-13 23:46:24 +00:00
Fix another stray PyString reference that should be PyBytes; and its comment.
This commit is contained in:
parent
641591cffe
commit
df4ce10276
1 changed files with 2 additions and 2 deletions
|
|
@ -357,7 +357,7 @@ check_bom(int get_char(struct tok_state *),
|
||||||
1) NULL: need to call tok->decoding_readline to get a new line
|
1) NULL: need to call tok->decoding_readline to get a new line
|
||||||
2) PyUnicodeObject *: decoding_feof has called tok->decoding_readline and
|
2) PyUnicodeObject *: decoding_feof has called tok->decoding_readline and
|
||||||
stored the result in tok->decoding_buffer
|
stored the result in tok->decoding_buffer
|
||||||
3) PyStringObject *: previous call to fp_readl did not have enough room
|
3) PyBytesObject *: previous call to fp_readl did not have enough room
|
||||||
(in the s buffer) to copy entire contents of the line read
|
(in the s buffer) to copy entire contents of the line read
|
||||||
by tok->decoding_readline. tok->decoding_buffer has the overflow.
|
by tok->decoding_readline. tok->decoding_buffer has the overflow.
|
||||||
In this case, fp_readl is called in a loop (with an expanded buffer)
|
In this case, fp_readl is called in a loop (with an expanded buffer)
|
||||||
|
|
@ -625,7 +625,7 @@ decode_str(const char *str, struct tok_state *tok)
|
||||||
utf8 = translate_into_utf8(str, tok->enc);
|
utf8 = translate_into_utf8(str, tok->enc);
|
||||||
if (utf8 == NULL)
|
if (utf8 == NULL)
|
||||||
return error_ret(tok);
|
return error_ret(tok);
|
||||||
str = PyString_AsString(utf8);
|
str = PyBytes_AsString(utf8);
|
||||||
}
|
}
|
||||||
for (s = str;; s++) {
|
for (s = str;; s++) {
|
||||||
if (*s == '\0') break;
|
if (*s == '\0') break;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue