summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xLib/test/test_binascii.py2
-rw-r--r--Misc/NEWS4
-rw-r--r--Modules/binascii.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/Lib/test/test_binascii.py b/Lib/test/test_binascii.py
index 8df450456e..8272ad91aa 100755
--- a/Lib/test/test_binascii.py
+++ b/Lib/test/test_binascii.py
@@ -134,7 +134,7 @@ class BinASCIITest(unittest.TestCase):
pass
else:
self.fail("binascii.a2b_qp(**{1:1}) didn't raise TypeError")
- self.assertEqual(binascii.a2b_qp("= "), "")
+ self.assertEqual(binascii.a2b_qp("= "), "= ")
self.assertEqual(binascii.a2b_qp("=="), "=")
self.assertEqual(binascii.a2b_qp("=AX"), "=AX")
self.assertRaises(TypeError, binascii.b2a_qp, foo="bar")
diff --git a/Misc/NEWS b/Misc/NEWS
index d619308006..221acbb033 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -70,6 +70,10 @@ Core and builtins
Extension Modules
-----------------
+- Bug #1588217: don't parse "= " as a soft line break in binascii's
+ a2b_qp() function, instead leave it in the string as quopri.decode()
+ does.
+
- Patch #838546: Make terminal become controlling in pty.fork()
- Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 3b2c8b254c..4dee45198e 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -1057,8 +1057,7 @@ binascii_a2b_qp(PyObject *self, PyObject *args, PyObject *kwargs)
in++;
if (in >= datalen) break;
/* Soft line breaks */
- if ((data[in] == '\n') || (data[in] == '\r') ||
- (data[in] == ' ') || (data[in] == '\t')) {
+ if ((data[in] == '\n') || (data[in] == '\r')) {
if (data[in] != '\n') {
while (in < datalen && data[in] != '\n') in++;
}