Moves audit to _gcd_import.

Author: Lisa Carrier

Lib/importlib/__init__.py

@@ -86,16 +86,6 @@ def import_module(name, package=None):
                 break
             level += 1
     module = _bootstrap._gcd_import(name[level:], package, level)
-    if module:
-        sys.audit(
-            "import",
-            name,
-            # We could try to grab __file__ here but it breaks LazyLoader
-            None,
-            sys.path,
-            sys.meta_path,
-            sys.path_hooks
-        )
     return module
 
 

Lib/importlib/_bootstrap.py

@@ -1395,6 +1395,10 @@ def _gcd_import(name, package=None, level=0):
     _sanity_check(name, package, level)
     if level > 0:
         name = _resolve_name(name, package, level)
+    module = sys.modules.get(name, _NEEDS_LOADING)
+    if (module is _NEEDS_LOADING or
+        getattr(getattr(module, "__spec__", None), "_initializing", False)):
+        sys.audit("import", name, None, sys.path, sys.meta_path, sys.path_hooks)
     return _find_and_load(name, _gcd_import)
 
 

Lib/test/audit-tests.py

@@ -676,14 +676,18 @@ def test_import_module():
     import importlib
 
     with TestHook() as hook:
-        importlib.import_module("os")  # random stdlib
+        importlib.import_module("importlib")  # already imported, won't get logged
+        importlib.import_module("email") # standard library module
         importlib.import_module("pythoninfo")  # random module
+        importlib.import_module(".test_importlib.abc", "test")  # relative import
 
     actual = [a[0] for e, a in hook.seen if e == "import"]
     assertSequenceEqual(
         [
-            "os",
+            "email",
             "pythoninfo",
+            "test.test_importlib.abc",
+            "test.test_importlib"
         ],
         actual,
     )