python · shihai1991 · Apr 6, 2020 · serhiy-storchaka · Sep 30, 2021 · shihai1991
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -240,8 +240,10 @@ def _save_and_remove_module(name, orig_modules):
    """
    # try to import the module and raise an error if it can't be imported
    if name not in sys.modules:
+        orig_modules = sys.modules.copy()
        __import__(name)
-        del sys.modules[name]
+        sys.modules.clear()
+        sys.modules.update(orig_modules)
    for modname in list(sys.modules):
        if modname == name or modname.startswith(name + '.'):
            orig_modules[modname] = sys.modules[modname]
-Original file line number
+Diff line change
@@ -240,8 +240,10 @@ def _save_and_remove_module(name, orig_modules):
         """
         # try to import the module and raise an error if it can't be imported
         if name not in sys.modules:
+            orig_modules = sys.modules.copy()
             __import__(name)
-            del sys.modules[name]
+            sys.modules.clear()
+            sys.modules.update(orig_modules)
         Comment thread


        

        
      

        
            
      
      Comment on lines

    
      +245
     to 
      +246
    

  

  



  
    
        
        
  
    
      
          
      

      
            serhiy-storchaka
  

      

      

      


        Sep 30, 2021



      
    

  

  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        

  
  Member


        

    
  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I considered this option, but some modules can not support re-importing. So it is safer to restore only explicitly mentioned modules and their submodules.

See #28654.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    


      



    
        
  
    
      
          
      

      
            shihai1991
  

      

      

      


        Oct 6, 2021



      
    

  

  
    
      
          
    
  


        
            
  
      
              Copy link

  
              
  
      
                Copy Markdown

  
        
      
    

    
        

  
  Member


        

  Author


    
  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Oh, sorry, Serhiy. I missed your PR :(
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
         for modname in list(sys.modules):
             if modname == name or modname.startswith(name + '.'):
                 orig_modules[modname] = sys.modules[modname]
-          Expand Down