commit a55efb3b6fe8c386a01b7fe7e9cf91d455fb4b7a
author Giampaolo Rodola' <g.rodola@gmail.com> Sat May 07 16:06:59 2011 +0200
committer Giampaolo Rodola' <g.rodola@gmail.com> Sat May 07 16:06:59 2011 +0200
tree 3e8a5d2fd90ee56601fcbccb57ac4f0b192c5e01
parent 052a899d5a38c4aaac09d86f2f8d1f6093f866c0

#11072- applying http://bugs.python.org/review/11072/show suggestions

Lib/test/test_ftplib.py

diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 8d75b96..cf961ae 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -586,10 +586,12 @@
 
         ls = list(self.client.mlsd())
         for name, facts in ls:
+            self.assertIsInstance(name, str)
+            self.assertIsInstance(facts, dict)
             self.assertTrue(name)
-            self.assertTrue('type' in facts)
-            self.assertTrue('perm' in facts)
-            self.assertTrue('unique' in facts)
+            self.assertIn('type', facts)
+            self.assertIn('perm', facts)
+            self.assertIn('unique', facts)
 
         def set_data(data):
             self.server.handler_instance.next_data = data
@@ -626,7 +628,8 @@
         # case sensitiveness
         set_data('Type=type;TyPe=perm;UNIQUE=unique; name\r\n')
         _name, facts = next(self.client.mlsd())
-        [self.assertTrue(x.islower()) for x in facts.keys()]
+        for x in facts:
+            self.assertTrue(x.islower())
         # no data (directory empty)
         set_data('')
         self.assertRaises(StopIteration, next, self.client.mlsd())