diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-07 11:08:19 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-07 11:08:19 (GMT) |
commit | 344f8316fd52205b19689dbdf44cfcfb338d127e (patch) | |
tree | 3f56062a019d3b50ea5974cfb5b74d16dee52f6b | |
parent | 3bc13cc8b0b85f989b8da9c5718fc5319ad06248 (diff) | |
download | cpython-344f8316fd52205b19689dbdf44cfcfb338d127e.zip cpython-344f8316fd52205b19689dbdf44cfcfb338d127e.tar.gz cpython-344f8316fd52205b19689dbdf44cfcfb338d127e.tar.bz2 |
Issue #19593: Use specific asserts in importlib tests.
-rw-r--r-- | Lib/test/test_import.py | 6 | ||||
-rw-r--r-- | Lib/test/test_importlib/builtin/test_loader.py | 2 | ||||
-rw-r--r-- | Lib/test/test_importlib/import_/test_fromlist.py | 2 | ||||
-rw-r--r-- | Lib/test/test_importlib/import_/test_meta_path.py | 2 | ||||
-rw-r--r-- | Lib/test/test_importlib/test_abc.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index bda1541..781a159 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -190,12 +190,12 @@ class ImportTests(unittest.TestCase): # import x.y.z binds x in the current namespace import test as x import test.support - self.assertTrue(x is test, x.__name__) + self.assertIs(x, 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.assertTrue(y is test.support, y.__name__) + self.assertIs(y, test.support, y.__name__) def test_failing_reload(self): # A failing reload should leave the module object in sys.modules. @@ -223,7 +223,7 @@ class ImportTests(unittest.TestCase): self.assertRaises(ZeroDivisionError, importlib.reload, mod) # But we still expect the module to be in sys.modules. mod = sys.modules.get(TESTFN) - self.assertIsNot(mod, None, "expected module to be in sys.modules") + self.assertIsNotNone(mod, "expected module to be in sys.modules") # We should have replaced a w/ 10, but the old b value should # stick. diff --git a/Lib/test/test_importlib/builtin/test_loader.py b/Lib/test/test_importlib/builtin/test_loader.py index a636f77..1f83574 100644 --- a/Lib/test/test_importlib/builtin/test_loader.py +++ b/Lib/test/test_importlib/builtin/test_loader.py @@ -87,7 +87,7 @@ class InspectLoaderTests: def test_is_package(self): # Cannot be a package. result = self.machinery.BuiltinImporter.is_package(builtin_util.NAME) - self.assertTrue(not result) + self.assertFalse(result) def test_not_builtin(self): # Modules not built-in should raise ImportError. diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py index 58f244b..a755b75 100644 --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -61,7 +61,7 @@ class HandlingFromlist: with util.import_state(meta_path=[importer]): module = self.__import__('module', fromlist=['non_existent']) self.assertEqual(module.__name__, 'module') - self.assertTrue(not hasattr(module, 'non_existent')) + self.assertFalse(hasattr(module, 'non_existent')) def test_module_from_package(self): # [module] diff --git a/Lib/test/test_importlib/import_/test_meta_path.py b/Lib/test/test_importlib/import_/test_meta_path.py index dc45420..5eeb145 100644 --- a/Lib/test/test_importlib/import_/test_meta_path.py +++ b/Lib/test/test_importlib/import_/test_meta_path.py @@ -96,7 +96,7 @@ class CallSignature: args = log[1][0] kwargs = log[1][1] # Assuming all arguments are positional. - self.assertTrue(not kwargs) + self.assertFalse(kwargs) self.assertEqual(args[0], mod_name) self.assertIs(args[1], path) diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py index 09b7294..a1f8e76 100644 --- a/Lib/test/test_importlib/test_abc.py +++ b/Lib/test/test_importlib/test_abc.py @@ -783,7 +783,7 @@ class SourceOnlyLoaderTests(SourceLoaderTestHarness): warnings.simplefilter('ignore', DeprecationWarning) module = self.loader.load_module(self.name) self.verify_module(module) - self.assertTrue(not hasattr(module, '__path__')) + self.assertFalse(hasattr(module, '__path__')) def test_get_source_encoding(self): # Source is considered encoded in UTF-8 by default unless otherwise |