Change rfc822_escape() to ensure there's a consistent amount of whitespace
after each newline, instead of just blindly inserting a space at
the start of each line. (Improvement suggested by Thomas Wouters)
diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py
index 010db9a..01abd34 100644
--- a/Lib/distutils/util.py
+++ b/Lib/distutils/util.py
@@ -446,10 +446,11 @@
def rfc822_escape (header):
"""Return a version of the string escaped for inclusion in an
- RFC-822 header, by adding a space after each newline.
+ RFC-822 header, by ensuring there are 8 spaces space after each newline.
"""
- header = string.rstrip(header)
- header = string.replace(header, '\n', '\n ')
+ lines = string.split(header, '\n')
+ lines = map(string.strip, lines)
+ header = string.join(lines, '\n' + 8*' ')
return header