diff options
Diffstat (limited to 'Lib/importlib/test/source')
| -rw-r--r-- | Lib/importlib/test/source/test_abc_loader.py | 21 | ||||
| -rw-r--r-- | Lib/importlib/test/source/test_file_loader.py | 12 | ||||
| -rw-r--r-- | Lib/importlib/test/source/test_finder.py | 2 |
3 files changed, 17 insertions, 18 deletions
diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/importlib/test/source/test_abc_loader.py index fc98b93..27babb9 100644 --- a/Lib/importlib/test/source/test_abc_loader.py +++ b/Lib/importlib/test/source/test_abc_loader.py @@ -221,7 +221,7 @@ class PyLoaderTests(testing_abc.LoaderTests): mock = self.mocker({name: path}) with util.uncache(name): module = mock.load_module(name) - self.assertTrue(name in sys.modules) + self.assertIn(name, sys.modules) self.eq_attrs(module, __name__=name, __file__=path, __package__='', __loader__=mock) self.assertTrue(not hasattr(module, '__path__')) @@ -233,7 +233,7 @@ class PyLoaderTests(testing_abc.LoaderTests): mock = self.mocker({name: path}) with util.uncache(name): module = mock.load_module(name) - self.assertTrue(name in sys.modules) + self.assertIn(name, sys.modules) self.eq_attrs(module, __name__=name, __file__=path, __path__=[os.path.dirname(path)], __package__=name, __loader__=mock) @@ -259,8 +259,8 @@ class PyLoaderTests(testing_abc.LoaderTests): with util.uncache(name): sys.modules[name] = module loaded_module = mock.load_module(name) - self.assertTrue(loaded_module is module) - self.assertTrue(sys.modules[name] is module) + self.assertIs(loaded_module, module) + self.assertIs(sys.modules[name], module) return mock, name def test_state_after_failure(self): @@ -273,7 +273,7 @@ class PyLoaderTests(testing_abc.LoaderTests): sys.modules[name] = module with self.assertRaises(ZeroDivisionError): mock.load_module(name) - self.assertTrue(sys.modules[name] is module) + self.assertIs(sys.modules[name], module) self.assertTrue(hasattr(module, 'blah')) return mock @@ -284,7 +284,7 @@ class PyLoaderTests(testing_abc.LoaderTests): with util.uncache(name): with self.assertRaises(ZeroDivisionError): mock.load_module(name) - self.assertTrue(name not in sys.modules) + self.assertNotIn(name, sys.modules) return mock @@ -414,8 +414,7 @@ class SkipWritingBytecodeTests(unittest.TestCase): sys.dont_write_bytecode = dont_write_bytecode with util.uncache(name): mock.load_module(name) - self.assertTrue((name in mock.module_bytecode) is not - dont_write_bytecode) + self.assertIsNot(name in mock.module_bytecode, dont_write_bytecode) def test_no_bytecode_written(self): self.run_test(True) @@ -440,7 +439,7 @@ class RegeneratedBytecodeTests(unittest.TestCase): 'magic': bad_magic}}) with util.uncache(name): mock.load_module(name) - self.assertTrue(name in mock.module_bytecode) + self.assertIn(name, mock.module_bytecode) magic = mock.module_bytecode[name][:4] self.assertEqual(magic, imp.get_magic()) @@ -453,7 +452,7 @@ class RegeneratedBytecodeTests(unittest.TestCase): {name: {'path': 'path/to/mod.bytecode', 'mtime': old_mtime}}) with util.uncache(name): mock.load_module(name) - self.assertTrue(name in mock.module_bytecode) + self.assertIn(name, mock.module_bytecode) mtime = importlib._r_long(mock.module_bytecode[name][4:8]) self.assertEqual(mtime, PyPycLoaderMock.default_mtime) @@ -621,7 +620,7 @@ class SourceOnlyLoaderTests(SourceLoaderTestHarness): module = self.loader.load_module(self.name) self.verify_module(module) self.assertEqual(module.__path__, [os.path.dirname(self.path)]) - self.assertTrue(self.name in sys.modules) + self.assertIn(self.name, sys.modules) def test_package_settings(self): # __package__ needs to be set, while __path__ is set on if the module diff --git a/Lib/importlib/test/source/test_file_loader.py b/Lib/importlib/test/source/test_file_loader.py index ffa0c24..236abfb 100644 --- a/Lib/importlib/test/source/test_file_loader.py +++ b/Lib/importlib/test/source/test_file_loader.py @@ -64,7 +64,7 @@ class SimpleTest(unittest.TestCase): with source_util.create_modules('_temp') as mapping: loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp']) module = loader.load_module('_temp') - self.assertTrue('_temp' in sys.modules) + self.assertIn('_temp', sys.modules) check = {'__name__': '_temp', '__file__': mapping['_temp'], '__package__': ''} for attr, value in check.items(): @@ -75,7 +75,7 @@ class SimpleTest(unittest.TestCase): loader = _bootstrap.SourceFileLoader('_pkg', mapping['_pkg.__init__']) module = loader.load_module('_pkg') - self.assertTrue('_pkg' in sys.modules) + self.assertIn('_pkg', sys.modules) check = {'__name__': '_pkg', '__file__': mapping['_pkg.__init__'], '__path__': [os.path.dirname(mapping['_pkg.__init__'])], '__package__': '_pkg'} @@ -88,7 +88,7 @@ class SimpleTest(unittest.TestCase): loader = _bootstrap.SourceFileLoader('_pkg.mod', mapping['_pkg.mod']) module = loader.load_module('_pkg.mod') - self.assertTrue('_pkg.mod' in sys.modules) + self.assertIn('_pkg.mod', sys.modules) check = {'__name__': '_pkg.mod', '__file__': mapping['_pkg.mod'], '__package__': '_pkg'} for attr, value in check.items(): @@ -107,7 +107,7 @@ class SimpleTest(unittest.TestCase): with open(mapping['_temp'], 'w') as file: file.write("testing_var = 42\n") module = loader.load_module('_temp') - self.assertTrue('testing_var' in module.__dict__, + self.assertIn('testing_var', module.__dict__, "'testing_var' not in " "{0}".format(list(module.__dict__.keys()))) self.assertEqual(module, sys.modules['_temp']) @@ -139,7 +139,7 @@ class SimpleTest(unittest.TestCase): loader = _bootstrap.SourceFileLoader('_temp', mapping['_temp']) with self.assertRaises(SyntaxError): loader.load_module('_temp') - self.assertTrue('_temp' not in sys.modules) + self.assertNotIn('_temp', sys.modules) def test_file_from_empty_string_dir(self): # Loading a module found from an empty string entry on sys.path should @@ -189,7 +189,7 @@ class BadBytecodeTest(unittest.TestCase): def import_(self, file, module_name): loader = self.loader(module_name, file) module = loader.load_module(module_name) - self.assertTrue(module_name in sys.modules) + self.assertIn(module_name, sys.modules) def manipulate_bytecode(self, name, mapping, manipulator, *, del_source=False): diff --git a/Lib/importlib/test/source/test_finder.py b/Lib/importlib/test/source/test_finder.py index b22c103..e1ef938 100644 --- a/Lib/importlib/test/source/test_finder.py +++ b/Lib/importlib/test/source/test_finder.py @@ -115,7 +115,7 @@ class FinderTests(abc.FinderTests): def test_failure(self): with source_util.create_modules('blah') as mapping: nothing = self.import_(mapping['.root'], 'sdfsadsadf') - self.assertTrue(nothing is None) + self.assertIs(nothing, None) def test_empty_string_for_dir(self): # The empty string from sys.path means to search in the cwd. |