mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	Issue #17177: stop using imp in test_importlib
This commit is contained in:
		
							parent
							
								
									53e600c24a
								
							
						
					
					
						commit
						ef888024d8
					
				
					 16 changed files with 78 additions and 76 deletions
				
			
		|  | @ -1,5 +1,5 @@ | |||
| from . import util | ||||
| import imp | ||||
| 
 | ||||
| import importlib | ||||
| from importlib import _bootstrap | ||||
| from importlib import machinery | ||||
|  | @ -99,7 +99,7 @@ def test_sys_modules(self): | |||
|         # If a module with __loader__ is in sys.modules, then return it. | ||||
|         name = 'some_mod' | ||||
|         with util.uncache(name): | ||||
|             module = imp.new_module(name) | ||||
|             module = types.ModuleType(name) | ||||
|             loader = 'a loader!' | ||||
|             module.__loader__ = loader | ||||
|             sys.modules[name] = module | ||||
|  | @ -110,7 +110,7 @@ def test_sys_modules_loader_is_None(self): | |||
|         # If sys.modules[name].__loader__ is None, raise ValueError. | ||||
|         name = 'some_mod' | ||||
|         with util.uncache(name): | ||||
|             module = imp.new_module(name) | ||||
|             module = types.ModuleType(name) | ||||
|             module.__loader__ = None | ||||
|             sys.modules[name] = module | ||||
|             with self.assertRaises(ValueError): | ||||
|  | @ -121,7 +121,7 @@ def test_sys_modules_loader_is_not_set(self): | |||
|         # Issue #17099 | ||||
|         name = 'some_mod' | ||||
|         with util.uncache(name): | ||||
|             module = imp.new_module(name) | ||||
|             module = types.ModuleType(name) | ||||
|             try: | ||||
|                 del module.__loader__ | ||||
|             except AttributeError: | ||||
|  | @ -189,7 +189,7 @@ def invalidate_caches(self): | |||
|     def test_method_lacking(self): | ||||
|         # There should be no issues if the method is not defined. | ||||
|         key = 'gobbledeegook' | ||||
|         sys.path_importer_cache[key] = imp.NullImporter('abc') | ||||
|         sys.path_importer_cache[key] = None | ||||
|         self.addCleanup(lambda: sys.path_importer_cache.__delitem__(key)) | ||||
|         importlib.invalidate_caches()  # Shouldn't trigger an exception. | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brett Cannon
						Brett Cannon