[Python-checkins] python/dist/src/Lib/test test_email.py,1.28,1.29

tim_one@sourceforge.net tim_one@sourceforge.net
Mon, 15 Apr 2002 19:08:53 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv4267/python/Lib/test

Modified Files:
	test_email.py 
Log Message:
Apparently 3 of the tests here rely on trailing whitespace and/or hard
tab characters, so reverting the whitespace normalization.  Barry,
please repair this.


Index: test_email.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_email.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** test_email.py	16 Apr 2002 01:38:40 -0000	1.28
--- test_email.py	16 Apr 2002 02:08:51 -0000	1.29
***************
*** 314,318 ****
          eq(msg.get_params(),
             [('multipart/report', ''),
!             ('boundary', 'D1690A7AC1.996856090/mail.example.com')])
          msg.set_param("report-type", old_val)
          eq(msg.get_params(),
--- 314,318 ----
          eq(msg.get_params(),
             [('multipart/report', ''),
!             ('boundary', 'D1690A7AC1.996856090/mail.example.com')]) 
          msg.set_param("report-type", old_val)
          eq(msg.get_params(),
***************
*** 332,336 ****
          eq(msg['content-type'], 'text/html; charset="us-ascii"')
  
! 
  
  # Test the email.Encoders module
--- 332,336 ----
          eq(msg['content-type'], 'text/html; charset="us-ascii"')
  
!            
  
  # Test the email.Encoders module
***************
*** 410,414 ****
  Content-Transfer-Encoding: 7bit
  X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals";
!         spooge="yummy"; hippos="gargantuan"; marshmallows="gooey"
  
  ''')
--- 410,414 ----
  Content-Transfer-Encoding: 7bit
  X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals";
! 	spooge="yummy"; hippos="gargantuan"; marshmallows="gooey"
  
  ''')
***************
*** 451,470 ****
          msg['Received'] = """\
  from babylon.socal-raves.org (localhost [127.0.0.1]); by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81; for <mailman-admin@babylon.socal-raves.org>; Sat, 2 Feb 2002 17:00:06 -0800 (PST)
!         from babylon.socal-raves.org (localhost [127.0.0.1]); by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81; for <mailman-admin@babylon.socal-raves.org>; Sat, 2 Feb 2002 17:00:06 -0800 (PST)
!         from babylon.socal-raves.org (localhost [127.0.0.1]); by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81; for <mailman-admin@babylon.socal-raves.org>; Sat, 2 Feb 2002 17:00:06 -0800 (PST)
  """
          self.assertEqual(msg.as_string(), """\
  Received: from babylon.socal-raves.org (localhost [127.0.0.1]);
!         by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81;
!         for <mailman-admin@babylon.socal-raves.org>;
!         Sat, 2 Feb 2002 17:00:06 -0800 (PST)
!         from babylon.socal-raves.org (localhost [127.0.0.1]);
!         by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81;
!         for <mailman-admin@babylon.socal-raves.org>;
!         Sat, 2 Feb 2002 17:00:06 -0800 (PST)
!         from babylon.socal-raves.org (localhost [127.0.0.1]);
!         by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81;
!         for <mailman-admin@babylon.socal-raves.org>;
!         Sat, 2 Feb 2002 17:00:06 -0800 (PST)
  
  
--- 451,470 ----
          msg['Received'] = """\
  from babylon.socal-raves.org (localhost [127.0.0.1]); by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81; for <mailman-admin@babylon.socal-raves.org>; Sat, 2 Feb 2002 17:00:06 -0800 (PST)
! 	from babylon.socal-raves.org (localhost [127.0.0.1]); by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81; for <mailman-admin@babylon.socal-raves.org>; Sat, 2 Feb 2002 17:00:06 -0800 (PST)
! 	from babylon.socal-raves.org (localhost [127.0.0.1]); by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81; for <mailman-admin@babylon.socal-raves.org>; Sat, 2 Feb 2002 17:00:06 -0800 (PST)
  """
          self.assertEqual(msg.as_string(), """\
  Received: from babylon.socal-raves.org (localhost [127.0.0.1]);
! 	by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81;
! 	for <mailman-admin@babylon.socal-raves.org>;
! 	Sat, 2 Feb 2002 17:00:06 -0800 (PST)
! 	from babylon.socal-raves.org (localhost [127.0.0.1]);
! 	by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81;
! 	for <mailman-admin@babylon.socal-raves.org>;
! 	Sat, 2 Feb 2002 17:00:06 -0800 (PST)
! 	from babylon.socal-raves.org (localhost [127.0.0.1]);
! 	by babylon.socal-raves.org (Postfix) with ESMTP id B570E51B81;
! 	for <mailman-admin@babylon.socal-raves.org>;
! 	Sat, 2 Feb 2002 17:00:06 -0800 (PST)
  
  
***************
*** 722,726 ****
  
  --BOUNDARY--
! ''')
  
      def test_one_part_in_a_multipart(self):
--- 722,726 ----
  
  --BOUNDARY--
! ''')        
  
      def test_one_part_in_a_multipart(self):
***************
*** 749,753 ****
  
  --BOUNDARY--
! ''')
  
      def test_seq_parts_in_a_multipart(self):
--- 749,753 ----
  
  --BOUNDARY--
! ''')        
  
      def test_seq_parts_in_a_multipart(self):
***************
*** 776,780 ****
  
  --BOUNDARY--
! ''')
  
  
--- 776,780 ----
  
  --BOUNDARY--
! ''')        
  
  
***************
*** 1164,1172 ****
          all = module.__all__
          all.sort()
!         self.assertEqual(all, ['Charset', 'Encoders', 'Errors', 'Generator',
!                                'Header', 'Iterators', 'MIMEAudio',
!                                'MIMEBase', 'MIMEImage', 'MIMEMessage',
                                 'MIMEText', 'Message', 'Parser',
!                                'Utils', 'base64MIME',
                                 'message_from_file', 'message_from_string',
                                 'quopriMIME'])
--- 1164,1172 ----
          all = module.__all__
          all.sort()
!         self.assertEqual(all, ['Charset', 'Encoders', 'Errors', 'Generator', 
!                                'Header', 'Iterators', 'MIMEAudio', 
!                                'MIMEBase', 'MIMEImage', 'MIMEMessage', 
                                 'MIMEText', 'Message', 'Parser',
!                                'Utils', 'base64MIME', 
                                 'message_from_file', 'message_from_string',
                                 'quopriMIME'])
***************
*** 1314,1318 ****
  To: bperson@dom.ain
  Subject: the next line has a space on it
! 
  Date: Mon, 8 Apr 2002 15:09:19 -0400
  Message-ID: spam
--- 1314,1318 ----
  To: bperson@dom.ain
  Subject: the next line has a space on it
!  
  Date: Mon, 8 Apr 2002 15:09:19 -0400
  Message-ID: spam
***************
*** 1368,1372 ****
  eHh4eCB4eHh4IA==\r
  """)
! 
      def test_header_encode(self):
          eq = self.assertEqual
--- 1368,1372 ----
  eHh4eCB4eHh4IA==\r
  """)
!         
      def test_header_encode(self):
          eq = self.assertEqual
***************
*** 1505,1509 ****
  
  two line""")
! 
  
  
--- 1505,1509 ----
  
  two line""")
!