changeset:   83065:9328e2b8a397
parent:      83063:68ed5b2ca867
parent:      83064:c78dfc6ce37a
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue Apr 02 22:13:49 2013 +0200
files:       Lib/test/test_ftplib.py
description:
(Merge 3.3) Close #6822: ftplib.FTP.storlines() expects a binary file, not a text file

Add an unit test to ensure that text files are rejectect (with TypeError)


diff -r 68ed5b2ca867 -r 9328e2b8a397 Lib/test/test_ftplib.py
--- a/Lib/test/test_ftplib.py	Tue Apr 02 13:10:52 2013 -0400
+++ b/Lib/test/test_ftplib.py	Tue Apr 02 22:13:49 2013 +0200
@@ -588,6 +588,10 @@
         self.client.storlines('stor foo', f, callback=lambda x: flag.append(None))
         self.assertTrue(flag)
 
+        f = io.StringIO(RETR_DATA.replace('\r\n', '\n'))
+        # storlines() expects a binary file, not a text file
+        self.assertRaises(TypeError, self.client.storlines, 'stor foo', f)
+
     def test_nlst(self):
         self.client.nlst()
         self.assertEqual(self.client.nlst(), NLST_DATA.split('\r\n')[:-1])