mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 73715 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line

  convert old fail* assertions to assert*
........
This commit is contained in:
Georg Brandl 2009-08-13 08:51:18 +00:00
parent ef82be368a
commit ab91fdef1f
274 changed files with 4538 additions and 4538 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_import.py
View file

@ -172,12 +172,12 @@ class ImportTest(unittest.TestCase):
# import x.y.z binds x in the current namespace
import test as x
import test.support
self.assert_(x is test, x.__name__)
self.assert_(hasattr(test.support, "__file__"))
self.assertTrue(x is test, x.__name__)
self.assertTrue(hasattr(test.support, "__file__"))
# import x.y.z as w binds z as w
import test.support as y
self.assert_(y is test.support, y.__name__)
self.assertTrue(y is test.support, y.__name__)
def test_import_initless_directory_warning(self):
with warnings.catch_warnings():
@ -195,7 +195,7 @@ class ImportTest(unittest.TestCase):
sys.path.insert(0, os.curdir)
try:
mod = __import__(TESTFN)
self.assert_(TESTFN in sys.modules, "expected module in sys.modules")
self.assertTrue(TESTFN in sys.modules, "expected module in sys.modules")
self.assertEquals(mod.a, 1, "module has wrong attribute values")
self.assertEquals(mod.b, 2, "module has wrong attribute values")
@ -212,7 +212,7 @@ class ImportTest(unittest.TestCase):
self.assertRaises(ZeroDivisionError, imp.reload, mod)
# But we still expect the module to be in sys.modules.
mod = sys.modules.get(TESTFN)
self.failIf(mod is None, "expected module to still be in sys.modules")
self.assertFalse(mod is None, "expected module to still be in sys.modules")
# We should have replaced a w/ 10, but the old b value should
# stick.
@ -234,12 +234,12 @@ class ImportTest(unittest.TestCase):
sys.path.insert(0, os.curdir)
try:
mod = __import__(TESTFN)
self.failUnless(mod.__file__.endswith('.py'))
self.assertTrue(mod.__file__.endswith('.py'))
os.remove(source)
del sys.modules[TESTFN]
mod = __import__(TESTFN)
ext = mod.__file__[-4:]
self.failUnless(ext in ('.pyc', '.pyo'), ext)
self.assertTrue(ext in ('.pyc', '.pyo'), ext)
finally:
sys.path.pop(0)
remove_files(TESTFN)