[Python-checkins] r80360 - in python/branches/release31-maint: Lib/email/test/test_email.py

[ezio.melotti]

Author: ezio.melotti
Date: Thu Apr 22 13:58:06 2010
New Revision: 80360

Log:
Merged revisions 80359 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80359 | ezio.melotti | 2010-04-22 14:57:12 +0300 (Thu, 22 Apr 2010) | 9 lines
  
  Merged revisions 80357 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80357 | ezio.melotti | 2010-04-22 14:53:21 +0300 (Thu, 22 Apr 2010) | 1 line
    
    Rephrase comment.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/email/test/test_email.py

Modified: python/branches/release31-maint/Lib/email/test/test_email.py
==============================================================================
--- python/branches/release31-maint/Lib/email/test/test_email.py	(original)
+++ python/branches/release31-maint/Lib/email/test/test_email.py	Thu Apr 22 13:58:06 2010
@@ -516,10 +516,10 @@
 
     def test_default_cte(self):
         eq = self.assertEqual
-        # With no explicit _charset its us-ascii, and all are 7-bit
+        # 7bit data and the default us-ascii _charset
         msg = MIMEText('hello world')
         eq(msg['content-transfer-encoding'], '7bit')
-        # Similar, but with 8-bit data
+        # Similar, but with 8bit data
         msg = MIMEText('hello \xf8 world')
         eq(msg['content-transfer-encoding'], '8bit')
         # And now with a different charset