[Python-3000-checkins] r53712 - in python/branches/p3yk/Lib/email: iterators.py test/test_email.py test/test_email_renamed.py

guido.van.rossum python-3000-checkins at python.org
Fri Feb 9 23:36:03 CET 2007


Author: guido.van.rossum
Date: Fri Feb  9 23:36:02 2007
New Revision: 53712

Modified:
   python/branches/p3yk/Lib/email/iterators.py
   python/branches/p3yk/Lib/email/test/test_email.py
   python/branches/p3yk/Lib/email/test/test_email_renamed.py
Log:
Fairly subtle fix for failing tests.


Modified: python/branches/p3yk/Lib/email/iterators.py
==============================================================================
--- python/branches/p3yk/Lib/email/iterators.py	(original)
+++ python/branches/p3yk/Lib/email/iterators.py	Fri Feb  9 23:36:02 2007
@@ -63,9 +63,9 @@
     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():

Modified: python/branches/p3yk/Lib/email/test/test_email.py
==============================================================================
--- python/branches/p3yk/Lib/email/test/test_email.py	(original)
+++ python/branches/p3yk/Lib/email/test/test_email.py	Fri Feb  9 23:36:02 2007
@@ -54,10 +54,9 @@
         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))

Modified: python/branches/p3yk/Lib/email/test/test_email_renamed.py
==============================================================================
--- python/branches/p3yk/Lib/email/test/test_email_renamed.py	(original)
+++ python/branches/p3yk/Lib/email/test/test_email_renamed.py	Fri Feb  9 23:36:02 2007
@@ -55,10 +55,9 @@
         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))


More information about the Python-3000-checkins mailing list