get_boundary(): Fix for SF bug #1060941. RFC 2046 says boundaries may begin
-- but not end -- with whitespace.
I will backport to Python 2.3.
diff --git a/Lib/email/Message.py b/Lib/email/Message.py
index 977f802..b466f39 100644
--- a/Lib/email/Message.py
+++ b/Lib/email/Message.py
@@ -719,7 +719,8 @@
boundary = self.get_param('boundary', missing)
if boundary is missing:
return failobj
- return Utils.collapse_rfc2231_value(boundary).strip()
+ # RFC 2046 says that boundaries may begin but not end in w/s
+ return Utils.collapse_rfc2231_value(boundary).rstrip()
def set_boundary(self, boundary):
"""Set the boundary parameter in Content-Type to 'boundary'.