[Python-checkins] r52766 - in python/branches/release25-maint: Lib/test/test_binascii.py Misc/NEWS Modules/binascii.c

[georg.brandl]

Author: georg.brandl
Date: Thu Nov 16 18:08:48 2006
New Revision: 52766

Modified:
   python/branches/release25-maint/Lib/test/test_binascii.py
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/binascii.c
Log:
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.
 (backport from rev. 52765)

Modified: python/branches/release25-maint/Lib/test/test_binascii.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_binascii.py	(original)
+++ python/branches/release25-maint/Lib/test/test_binascii.py	Thu Nov 16 18:08:48 2006
@@ -134,7 +134,7 @@
             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")

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Thu Nov 16 18:08:48 2006
@@ -70,6 +70,10 @@
 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

Modified: python/branches/release25-maint/Modules/binascii.c
==============================================================================
--- python/branches/release25-maint/Modules/binascii.c	(original)
+++ python/branches/release25-maint/Modules/binascii.c	Thu Nov 16 18:08:48 2006
@@ -1057,8 +1057,7 @@
 			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++;
 				}