Merged revisions 77727 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77727 | ezio.melotti | 2010-01-24 18:58:36 +0200 (Sun, 24 Jan 2010) | 1 line
use assert[Not]IsInstance where appropriate
........
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 63e061a..221b698 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -73,10 +73,10 @@
# Test both readline and readlines.
open_url = self.urlopen("http://www.python.org/")
try:
- self.assertTrue(isinstance(open_url.readline(), bytes),
- "readline did not return bytes")
- self.assertTrue(isinstance(open_url.readlines(), list),
- "readlines did not return a list")
+ self.assertIsInstance(open_url.readline(), bytes,
+ "readline did not return a string")
+ self.assertIsInstance(open_url.readlines(), list,
+ "readlines did not return a list")
finally:
open_url.close()
@@ -87,9 +87,9 @@
info_obj = open_url.info()
finally:
open_url.close()
- self.assertTrue(isinstance(info_obj, email.message.Message),
- "object returned by 'info' is not an instance of "
- "email.message.Message")
+ self.assertIsInstance(info_obj, email.message.Message,
+ "object returned by 'info' is not an "
+ "instance of email.message.Message")
self.assertEqual(info_obj.get_content_subtype(), "html")
def test_geturl(self):
@@ -177,8 +177,8 @@
# Make sure header returned as 2nd value from urlretrieve is good.
file_location, header = self.urlretrieve("http://www.python.org/")
os.unlink(file_location)
- self.assertTrue(isinstance(header, email.message.Message),
- "header is not an instance of email.message.Message")
+ self.assertIsInstance(header, email.message.Message,
+ "header is not an instance of email.message.Message")