diff options
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 4 | ||||
| -rw-r--r-- | setuptools/tests/test_markerlib.py | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 7ed0cd37..2f295b5c 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -236,7 +236,7 @@ class TestUserInstallTest(unittest.TestCase): f = open(egg_file, 'w') try: f.write('Name: foo\n') - except: + finally: f.close() sys.path.append(target) @@ -387,7 +387,7 @@ class TestSetupRequires(unittest.TestCase): lines = stdout.splitlines() self.assertTrue(len(lines) > 0) - self.assert_(lines[-1].strip(), 'test_pkg') + self.assertTrue(lines[-1].strip(), 'test_pkg') try: tempdir_context(setup_and_run) diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py index 7ff2f584..aa461846 100644 --- a/setuptools/tests/test_markerlib.py +++ b/setuptools/tests/test_markerlib.py @@ -16,15 +16,15 @@ class TestMarkerlib(unittest.TestCase): os_name = os.name - self.assert_(interpret("")) + self.assertTrue(interpret("")) - self.assert_(interpret("os.name != 'buuuu'")) - self.assert_(interpret("python_version > '1.0'")) - self.assert_(interpret("python_version < '5.0'")) - self.assert_(interpret("python_version <= '5.0'")) - self.assert_(interpret("python_version >= '1.0'")) - self.assert_(interpret("'%s' in os.name" % os_name)) - self.assert_(interpret("'buuuu' not in os.name")) + self.assertTrue(interpret("os.name != 'buuuu'")) + self.assertTrue(interpret("python_version > '1.0'")) + self.assertTrue(interpret("python_version < '5.0'")) + self.assertTrue(interpret("python_version <= '5.0'")) + self.assertTrue(interpret("python_version >= '1.0'")) + self.assertTrue(interpret("'%s' in os.name" % os_name)) + self.assertTrue(interpret("'buuuu' not in os.name")) self.assertFalse(interpret("os.name == 'buuuu'")) self.assertFalse(interpret("python_version < '1.0'")) @@ -36,7 +36,7 @@ class TestMarkerlib(unittest.TestCase): environment = default_environment() environment['extra'] = 'test' - self.assert_(interpret("extra == 'test'", environment)) + self.assertTrue(interpret("extra == 'test'", environment)) self.assertFalse(interpret("extra == 'doc'", environment)) def raises_nameError(): |