Fairly subtle fix for failing tests.

Author: gvanrossum

Lib/email/iterators.py

@@ -63,9 +63,9 @@ def _structure(msg, fp=None, level=0, include_default=False):
     if fp is None:
         fp = sys.stdout
     tab = ' ' * (level * 4)
-    print(tab + msg.get_content_type(), end=' ', file=fp)
+    print(tab + msg.get_content_type(), end='', file=fp)
     if include_default:
-        print('[%s]' % msg.get_default_type(), file=fp)
+        print(' [%s]' % msg.get_default_type(), file=fp)
     else:
         print(file=fp)
     if msg.is_multipart():

Lib/email/test/test_email.py

@@ -54,10 +54,9 @@ def ndiffAssertEqual(self, first, second):
         if first != second:
             sfirst = str(first)
             ssecond = str(second)
-            diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
-            fp = StringIO()
-            print(NL, NL.join(diff), file=fp)
-            raise self.failureException, fp.getvalue()
+            diff = difflib.ndiff(sfirst.splitlines(True),
+                                 ssecond.splitlines(True))
+            raise self.failureException(NL + "".join(diff))
 
     def _msgobj(self, filename):
         fp = openfile(findfile(filename))

Lib/email/test/test_email_renamed.py

@@ -55,10 +55,9 @@ def ndiffAssertEqual(self, first, second):
         if first != second:
             sfirst = str(first)
             ssecond = str(second)
-            diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
-            fp = StringIO()
-            print(NL, NL.join(diff), file=fp)
-            raise self.failureException, fp.getvalue()
+            diff = difflib.ndiff(sfirst.splitlines(True),
+                                 ssecond.splitlines(True))
+            raise self.failureException(NL + "".join(diff))
 
     def _msgobj(self, filename):
         fp = openfile(findfile(filename))