old_contents: """Run Python's standard test suite using importlib.__import__.
  
  Tests known to fail because of assumptions that importlib (properly)
  invalidates are automatically skipped if the entire test suite is run.
  Otherwise all command-line options valid for test.regrtest are also valid for
  this script.
  
  XXX FAILING
      test_import  # execution bit, exception name differing, file name differing
                      between code and module (?)
  
  """
  import importlib
  import sys
  from test import regrtest
  
  if __name__ == '__main__':
      __builtins__.__import__ = importlib.__import__
  
      exclude = ['--exclude',
                  'test_frozen', # Does not expect __loader__ attribute
                  'test_pkg',  # Does not expect __loader__ attribute
                  'test_pydoc', # Does not expect __loader__ attribute
                ]
  
      # Switching on --exclude implies running all test but the ones listed, so
      # only use it when one is not running an explicit test
      if len(sys.argv) == 1:
          # No programmatic way to specify tests to exclude
          sys.argv.extend(exclude)
  
      regrtest.main(quiet=True, verbose2=True)
  
new_contents: """Run Python's standard test suite using importlib.__import__.
  
  Tests known to fail because of assumptions that importlib (properly)
  invalidates are automatically skipped if the entire test suite is run.
  Otherwise all command-line options valid for test.regrtest are also valid for
  this script.
  
  XXX FAILING
      test_import
          execution bit
          file name differing between __file__ and co_filename (r68360 on trunk)
  
  """
  import importlib
  import sys
  from test import regrtest
  
  if __name__ == '__main__':
      __builtins__.__import__ = importlib.__import__
  
      exclude = ['--exclude',
                  'test_frozen', # Does not expect __loader__ attribute
                  'test_pkg',  # Does not expect __loader__ attribute
                  'test_pydoc', # Does not expect __loader__ attribute
                ]
  
      # Switching on --exclude implies running all test but the ones listed, so
      # only use it when one is not running an explicit test
      if len(sys.argv) == 1:
          # No programmatic way to specify tests to exclude
          sys.argv.extend(exclude)
  
      regrtest.main(quiet=True, verbose2=True)
  
subject: Clarify why test_import is failing under importlib.