mirror of
https://github.com/python/cpython.git
synced 2025-11-24 20:30:18 +00:00
Patch #1185447: binascii.b2a_qp() now correctly quotes binary characters
with ASCII value less than 32. Also, it correctly quotes dots only if they occur on a single line, as opposed to the previous behavior of quoting dots if they are the second character of any line.
This commit is contained in:
parent
7e2b6bb24f
commit
4aef7275cb
3 changed files with 22 additions and 4 deletions
|
|
@ -1160,12 +1160,14 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
|
|||
if ((data[in] > 126) ||
|
||||
(data[in] == '=') ||
|
||||
(header && data[in] == '_') ||
|
||||
((data[in] == '.') && (linelen == 1)) ||
|
||||
((data[in] == '.') && (linelen == 0) &&
|
||||
(data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) ||
|
||||
(!istext && ((data[in] == '\r') || (data[in] == '\n'))) ||
|
||||
((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) ||
|
||||
((data[in] < 33) &&
|
||||
(data[in] != '\r') && (data[in] != '\n') &&
|
||||
(quotetabs && ((data[in] != '\t') || (data[in] != ' ')))))
|
||||
(quotetabs ||
|
||||
(!quotetabs && ((data[in] != '\t') && (data[in] != ' '))))))
|
||||
{
|
||||
if ((linelen + 3) >= MAXLINESIZE) {
|
||||
linelen = 0;
|
||||
|
|
@ -1230,12 +1232,14 @@ binascii_b2a_qp (PyObject *self, PyObject *args, PyObject *kwargs)
|
|||
if ((data[in] > 126) ||
|
||||
(data[in] == '=') ||
|
||||
(header && data[in] == '_') ||
|
||||
((data[in] == '.') && (linelen == 1)) ||
|
||||
((data[in] == '.') && (linelen == 0) &&
|
||||
(data[in+1] == '\n' || data[in+1] == '\r' || data[in+1] == 0)) ||
|
||||
(!istext && ((data[in] == '\r') || (data[in] == '\n'))) ||
|
||||
((data[in] == '\t' || data[in] == ' ') && (in + 1 == datalen)) ||
|
||||
((data[in] < 33) &&
|
||||
(data[in] != '\r') && (data[in] != '\n') &&
|
||||
(quotetabs && ((data[in] != '\t') || (data[in] != ' ')))))
|
||||
(quotetabs ||
|
||||
(!quotetabs && ((data[in] != '\t') && (data[in] != ' '))))))
|
||||
{
|
||||
if ((linelen + 3 )>= MAXLINESIZE) {
|
||||
odata[out++] = '=';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue