Removes audit from import.c, moves to _find_and_load_unlocked.

Author: Lisa Carrier

Lib/importlib/_bootstrap.py

@@ -1306,6 +1306,7 @@ def _sanity_check(name, package, level):
 _ERR_MSG_PREFIX = 'No module named '
 
 def _find_and_load_unlocked(name, import_):
+    sys.audit("import", name, None, sys.path, sys.meta_path, sys.path_hooks)
     path = None
     parent = name.rpartition('.')[0]
     parent_spec = None
@@ -1395,10 +1396,6 @@ 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)
 
 

Python/import.c

@@ -3694,15 +3694,6 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name)
         Py_XDECREF(sys_path);
         return NULL;
     }
-    if (_PySys_Audit(tstate, "import", "OOOOO",
-                     abs_name, Py_None, sys_path ? sys_path : Py_None,
-                     sys_meta_path ? sys_meta_path : Py_None,
-                     sys_path_hooks ? sys_path_hooks : Py_None) < 0) {
-        Py_XDECREF(sys_path_hooks);
-        Py_XDECREF(sys_meta_path);
-        Py_XDECREF(sys_path);
-        return NULL;
-    }
     Py_XDECREF(sys_path_hooks);
     Py_XDECREF(sys_meta_path);
     Py_XDECREF(sys_path);