[Python-checkins] CVS: python/dist/src/Lib/test test_email.py,1.2,1.3 test_iter.py,1.21,1.22 test_profile.py,1.1,1.2 test_unicode.py,1.40,1.41

2001年10月03日 22:36:58 -0700

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv3849/python/Lib/test
Modified Files:
	test_email.py test_iter.py test_profile.py test_unicode.py 
Log Message:
Whitespace normalization.
Index: test_email.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_email.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_email.py	2001年09月26日 05:47:08	1.2
--- test_email.py	2001年10月04日 05:36:56	1.3
***************
*** 29,33 ****

! 
 def openfile(filename):
 path = os.path.join(os.path.dirname(test.regrtest.__file__),
--- 29,33 ----

! 
 def openfile(filename):
 path = os.path.join(os.path.dirname(test.regrtest.__file__),
***************
*** 36,40 ****

! 
 # Base test class
 class TestEmailBase(unittest.TestCase):
--- 36,40 ----

! 
 # Base test class
 class TestEmailBase(unittest.TestCase):
***************
*** 48,57 ****

! 
 # Test various aspects of the Message class's API
 class TestMessageAPI(TestEmailBase):
 def test_get_charsets(self):
 eq = self.assertEqual
! 
 msg = self._msgobj('msg_08.txt')
 charsets = msg.get_charsets()
--- 48,57 ----

! 
 # Test various aspects of the Message class's API
 class TestMessageAPI(TestEmailBase):
 def test_get_charsets(self):
 eq = self.assertEqual
! 
 msg = self._msgobj('msg_08.txt')
 charsets = msg.get_charsets()
***************
*** 176,180 ****
 "Content-Disposition: blarg; filename\n")
 self.assertEqual(msg.get_filename(), '')
! 
 def test_missing_boundary(self):
 msg = email.message_from_string("From: foo\n")
--- 176,180 ----
 "Content-Disposition: blarg; filename\n")
 self.assertEqual(msg.get_filename(), '')
! 
 def test_missing_boundary(self):
 msg = email.message_from_string("From: foo\n")
***************
*** 218,222 ****

! 
 # Test the email.Encoders module
 class TestEncoders(unittest.TestCase):
--- 218,222 ----

! 
 # Test the email.Encoders module
 class TestEncoders(unittest.TestCase):
***************
*** 255,259 ****

! 
 class TestLongHeaders(unittest.TestCase):
 def test_header_splitter(self):
--- 255,259 ----

! 
 class TestLongHeaders(unittest.TestCase):
 def test_header_splitter(self):
***************
*** 272,281 ****
 Content-Transfer-Encoding: 7bit
 X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals";
! 	spooge="yummy"; hippos="gargantuan"; marshmallows="gooey"

 ''')

! 
 class TestFromMangling(unittest.TestCase):
 def setUp(self):
--- 272,281 ----
 Content-Transfer-Encoding: 7bit
 X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals";
! spooge="yummy"; hippos="gargantuan"; marshmallows="gooey"

 ''')

! 
 class TestFromMangling(unittest.TestCase):
 def setUp(self):
***************
*** 310,314 ****

! 
 # Test the basic MIMEImage class
 class TestMIMEImage(unittest.TestCase):
--- 310,314 ----

! 
 # Test the basic MIMEImage class
 class TestMIMEImage(unittest.TestCase):
***************
*** 363,367 ****

! 
 # Test the basic MIMEText class
 class TestMIMEText(unittest.TestCase):
--- 363,367 ----

! 
 # Test the basic MIMEText class
 class TestMIMEText(unittest.TestCase):
***************
*** 384,388 ****

! 
 class TestMultipartMixed(unittest.TestCase):
 def setUp(self):
--- 384,388 ----

! 
 class TestMultipartMixed(unittest.TestCase):
 def setUp(self):
***************
*** 407,411 ****
 container['To'] = 'Dingus Lovers <cravindogs@cravindogs.com>'
 container['Subject'] = 'Here is your dingus fish'
! 
 now = 987809702.54848599
 timetuple = time.localtime(now)
--- 407,411 ----
 container['To'] = 'Dingus Lovers <cravindogs@cravindogs.com>'
 container['Subject'] = 'Here is your dingus fish'
! 
 now = 987809702.54848599
 timetuple = time.localtime(now)
***************
*** 446,450 ****

! 
 class TestNonConformant(TestEmailBase):
 def test_parse_missing_minor_type(self):
--- 446,450 ----

! 
 class TestNonConformant(TestEmailBase):
 def test_parse_missing_minor_type(self):
***************
*** 467,471 ****

! 
 class TestRFC2047(unittest.TestCase):
 def test_iso_8859_1(self):
--- 467,471 ----

! 
 class TestRFC2047(unittest.TestCase):
 def test_iso_8859_1(self):
***************
*** 498,502 ****

! 
 class TestMIMEMessage(TestEmailBase):
 def setUp(self):
--- 498,502 ----

! 
 class TestMIMEMessage(TestEmailBase):
 def setUp(self):
***************
*** 604,608 ****

! 
 class TestIdempotent(unittest.TestCase):
 def _msgobj(self, filename):
--- 604,608 ----

! 
 class TestIdempotent(unittest.TestCase):
 def _msgobj(self, filename):
***************
*** 653,657 ****
 msg, text = self._msgobj('msg_06.txt')
 self._idempotent(msg, text)
! 
 def test_multipart_report(self):
 msg, text = self._msgobj('msg_05.txt')
--- 653,657 ----
 msg, text = self._msgobj('msg_06.txt')
 self._idempotent(msg, text)
! 
 def test_multipart_report(self):
 msg, text = self._msgobj('msg_05.txt')
***************
*** 661,665 ****
 msg, text = self._msgobj('msg_16.txt')
 self._idempotent(msg, text)
! 
 def test_content_type(self):
 eq = self.assertEquals
--- 661,665 ----
 msg, text = self._msgobj('msg_16.txt')
 self._idempotent(msg, text)
! 
 def test_content_type(self):
 eq = self.assertEquals
***************
*** 702,708 ****
 self.failUnless(isinstance(msg1.get_payload(), StringType))
 eq(msg1.get_payload(), '\n')
- 

! 
 class TestMiscellaneous(unittest.TestCase):
 def test_message_from_string(self):
--- 702,708 ----
 self.failUnless(isinstance(msg1.get_payload(), StringType))
 eq(msg1.get_payload(), '\n')

! 
! 
 class TestMiscellaneous(unittest.TestCase):
 def test_message_from_string(self):
***************
*** 745,749 ****
 class MyMessage(Message):
 pass
! 
 msg = email.message_from_string(text, MyMessage)
 unless(isinstance(msg, MyMessage))
--- 745,749 ----
 class MyMessage(Message):
 pass
! 
 msg = email.message_from_string(text, MyMessage)
 unless(isinstance(msg, MyMessage))
***************
*** 764,768 ****
 class MyMessage(Message):
 pass
! 
 fp = openfile('msg_01.txt')
 try:
--- 764,768 ----
 class MyMessage(Message):
 pass
! 
 fp = openfile('msg_01.txt')
 try:
***************
*** 781,785 ****

! 
 class TestIterators(TestEmailBase):
 def test_body_line_iterator(self):
--- 781,785 ----

! 
 class TestIterators(TestEmailBase):
 def test_body_line_iterator(self):
***************
*** 802,814 ****
 eq(EMPTYSTRING.join(lines), """\
 Send Ppp mailing list submissions to
! 	ppp@zzz.org

 To subscribe or unsubscribe via the World Wide Web, visit
! 	http://www.zzz.org/mailman/listinfo/ppp
 or, via email, send a message with subject or body 'help' to
! 	ppp-request@zzz.org

 You can reach the person managing the list at
! 	ppp-admin@zzz.org

 When replying, please edit your Subject line so it is more specific
--- 802,814 ----
 eq(EMPTYSTRING.join(lines), """\
 Send Ppp mailing list submissions to
! ppp@zzz.org

 To subscribe or unsubscribe via the World Wide Web, visit
! http://www.zzz.org/mailman/listinfo/ppp
 or, via email, send a message with subject or body 'help' to
! ppp-request@zzz.org

 You can reach the person managing the list at
! ppp-admin@zzz.org

 When replying, please edit your Subject line so it is more specific
***************
*** 864,868 ****

! 
 def suite():
 suite = unittest.TestSuite()
--- 864,868 ----

! 
 def suite():
 suite = unittest.TestSuite()
***************
*** 883,887 ****

! 
 if __name__ == '__main__':
 unittest.main(defaultTest='suite')
--- 883,887 ----

! 
 if __name__ == '__main__':
 unittest.main(defaultTest='suite')
Index: test_iter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_iter.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** test_iter.py	2001年09月23日 04:06:04	1.21
--- test_iter.py	2001年10月04日 05:36:56	1.22
***************
*** 649,653 ****
 self.assertRaises(TypeError, f.writelines, None)
 self.assertRaises(TypeError, f.writelines, 42)
! 
 f.writelines(["1\n", "2\n"])
 f.writelines(("3\n", "4\n"))
--- 649,653 ----
 self.assertRaises(TypeError, f.writelines, None)
 self.assertRaises(TypeError, f.writelines, 42)
! 
 f.writelines(["1\n", "2\n"])
 f.writelines(("3\n", "4\n"))
***************
*** 679,684 ****
 def __iter__(self):
 return Iterator(self.start, self.finish)
! 
! f.writelines(Whatever(6, 6+2000)) 
 f.close()

--- 679,684 ----
 def __iter__(self):
 return Iterator(self.start, self.finish)
! 
! f.writelines(Whatever(6, 6+2000))
 f.close()

***************
*** 686,690 ****
 expected = [str(i) + "\n" for i in range(1, 2006)]
 self.assertEqual(list(f), expected)
! 
 finally:
 f.close()
--- 686,690 ----
 expected = [str(i) + "\n" for i in range(1, 2006)]
 self.assertEqual(list(f), expected)
! 
 finally:
 f.close()
Index: test_profile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_profile.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_profile.py	2001年10月04日 00:58:24	1.1
--- test_profile.py	2001年10月04日 05:36:56	1.2
***************
*** 8,12 ****
 # included in the profile and would appear to consume all the time.)
 ticks = 0
! 
 def test_main():
 global ticks
--- 8,12 ----
 # included in the profile and would appear to consume all the time.)
 ticks = 0
! 
 def test_main():
 global ticks
Index: test_unicode.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** test_unicode.py	2001年09月21日 15:46:41	1.40
--- test_unicode.py	2001年10月04日 05:36:56	1.41
***************
*** 410,414 ****
 verify( x.encode('utf-7') == y )

! try: 
 unicode('+3ADYAA-', 'utf-7') # surrogates not supported
 except UnicodeError:
--- 410,414 ----
 verify( x.encode('utf-7') == y )

! try:
 unicode('+3ADYAA-', 'utf-7') # surrogates not supported
 except UnicodeError: