use assert[Not]In where appropriate

A patch from Dave Malcolm.
This commit is contained in:
Benjamin Peterson 2010-01-19 00:09:57 +00:00
parent a69ba65fdc
commit 577473fe68
75 changed files with 471 additions and 454 deletions

View file

@ -209,7 +209,7 @@ class ImportTest(unittest.TestCase):
sys.path.insert(0, os.curdir)
try:
mod = __import__(TESTFN)
self.assertTrue(TESTFN in sys.modules, "expected module in sys.modules")
self.assertIn(TESTFN, sys.modules)
self.assertEquals(mod.a, 1, "module has wrong attribute values")
self.assertEquals(mod.b, 2, "module has wrong attribute values")
@ -253,7 +253,7 @@ class ImportTest(unittest.TestCase):
del sys.modules[TESTFN]
mod = __import__(TESTFN)
ext = mod.__file__[-4:]
self.assertTrue(ext in ('.pyc', '.pyo'), ext)
self.assertIn(ext, ('.pyc', '.pyo'))
finally:
sys.path.pop(0)
remove_files(TESTFN)