mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 77727 via svnmerge from

Browse source 
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
........
This commit is contained in:
Ezio Melotti 2010-01-24 19:26:24 +00:00
parent f41d29a8eb
commit e96159335f
52 changed files with 287 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/test/test_raise.py
View file

@ -135,7 +135,7 @@ class TestCause(unittest.TestCase):
try:
raise IndexError from KeyError
except IndexError as e:
self.assertTrue(isinstance(e.__cause__, KeyError))
self.assertIsInstance(e.__cause__, KeyError)
else:
self.fail("No exception raised")
@ -166,7 +166,7 @@ class TestTraceback(unittest.TestCase):
try:
raise IndexError()
except IndexError as e:
self.assertTrue(isinstance(e.__traceback__, types.TracebackType))
self.assertIsInstance(e.__traceback__, types.TracebackType)
else:
self.fail("No exception raised")
@ -203,7 +203,7 @@ class TestContext(unittest.TestCase):
raise OSError()
except OSError as e:
self.assertNotEqual(e.__context__, context)
self.assertTrue(isinstance(e.__context__, context))
self.assertIsInstance(e.__context__, context)
else:
self.fail("No exception raised")
@ -216,7 +216,7 @@ class TestContext(unittest.TestCase):
raise OSError
except OSError as e:
self.assertNotEqual(e.__context__, context)
self.assertTrue(isinstance(e.__context__, context))
self.assertIsInstance(e.__context__, context)
else:
self.fail("No exception raised")
@ -227,7 +227,7 @@ class TestContext(unittest.TestCase):
except:
raise OSError
except OSError as e:
self.assertTrue(isinstance(e.__context__, ZeroDivisionError))
self.assertIsInstance(e.__context__, ZeroDivisionError)
else:
self.fail("No exception raised")
@ -238,7 +238,7 @@ class TestContext(unittest.TestCase):
except:
xyzzy
except NameError as e:
self.assertTrue(isinstance(e.__context__, ZeroDivisionError))
self.assertIsInstance(e.__context__, ZeroDivisionError)
else:
self.fail("No exception raised")
@ -260,7 +260,7 @@ class TestContext(unittest.TestCase):
finally:
raise OSError
except OSError as e:
self.assertTrue(isinstance(e.__context__, ZeroDivisionError))
self.assertIsInstance(e.__context__, ZeroDivisionError)
else:
self.fail("No exception raised")
@ -274,7 +274,7 @@ class TestContext(unittest.TestCase):
with ContextManager():
1/0
except NameError as e:
self.assertTrue(isinstance(e.__context__, ZeroDivisionError))
self.assertIsInstance(e.__context__, ZeroDivisionError)
else:
self.fail("No exception raised")
@ -320,7 +320,7 @@ class TestContext(unittest.TestCase):
del g
raise KeyError
except Exception as e:
self.assertTrue(isinstance(e.__context__, ValueError))
self.assertIsInstance(e.__context__, ValueError)
f()
@ -344,7 +344,7 @@ class TestContext(unittest.TestCase):
raise TypeError
except Exception as e:
self.assertNotEqual(e.__context__, None)
self.assertTrue(isinstance(e.__context__, AttributeError))
self.assertIsInstance(e.__context__, AttributeError)
with support.captured_output("stderr"):
f()