Move changes back to load_module_from_name()

Author: jacobtylerwalls

astroid/manager.py

@@ -7,12 +7,9 @@
 from various source and using a cache of built modules)
 """
 
-import io
-import logging
 import os
 import types
 import zipimport
-from contextlib import redirect_stderr, redirect_stdout
 from typing import TYPE_CHECKING, ClassVar, List, Optional
 
 from astroid.exceptions import AstroidBuildingError, AstroidImportError
@@ -36,9 +33,6 @@
 ZIP_IMPORT_EXTS = (".zip", ".egg", ".whl", ".pyz", ".pyzw")
 
 
-logger = logging.getLogger(__name__)
-
-
 def safe_repr(obj):
     try:
         return repr(obj)
@@ -173,29 +167,13 @@ def ast_from_module_name(self, modname, context_file=None):
                 ):
                     return self._build_stub_module(modname)
                 try:
-                    # Capture and log anything emitted during import to avoid
-                    # contaminating JSON reports in pylint
-                    with redirect_stderr(io.StringIO()) as stderr, redirect_stdout(
-                        io.StringIO()
-                    ) as stdout:
-                        module = load_module_from_name(modname)
+                    module = load_module_from_name(modname)
                 except Exception as e:
                     raise AstroidImportError(
                         "Loading {modname} failed with:\n{error}",
                         modname=modname,
                         path=found_spec.location,
                     ) from e
-                stderr_value = stderr.getvalue()
-                if stderr_value:
-                    logger.error(
-                        "Captured stderr from importing %s:\n%s", modname, stderr_value
-                    )
-                stdout_value = stdout.getvalue()
-                if stdout_value:
-                    logger.info(
-                        "Captured stdout from importing %s:\n%s", modname, stdout_value
-                    )
-
                 return self.ast_from_module(module, modname)
 
             elif found_spec.type == spec.ModuleType.PY_COMPILED:

astroid/modutils.py

@@ -17,17 +17,23 @@
 import importlib
 import importlib.machinery
 import importlib.util
+import io
 import itertools
+import logging
 import os
 import sys
 import sysconfig
 import types
+from contextlib import redirect_stderr, redirect_stdout
 from pathlib import Path
 from typing import Dict, Set
 
 from astroid.const import IS_JYTHON, IS_PYPY
 from astroid.interpreter._import import spec, util
 
+logger = logging.getLogger(__name__)
+
+
 if sys.platform.startswith("win"):
     PY_SOURCE_EXTS = ("py", "pyw")
     PY_COMPILED_EXTS = ("dll", "pyd")
@@ -171,7 +177,23 @@ def load_module_from_name(dotted_name: str) -> types.ModuleType:
     except KeyError:
         pass
 
-    return importlib.import_module(dotted_name)
+    # Capture and log anything emitted during import to avoid
+    # contaminating JSON reports in pylint
+    with redirect_stderr(io.StringIO()) as stderr, redirect_stdout(
+        io.StringIO()
+    ) as stdout:
+        module = importlib.import_module(dotted_name)
+
+    stderr_value = stderr.getvalue()
+    if stderr_value:
+        logger.error(
+            "Captured stderr from importing %s:\n%s", dotted_name, stderr_value
+        )
+    stdout_value = stdout.getvalue()
+    if stdout_value:
+        logger.info("Captured stdout from importing %s:\n%s", dotted_name, stdout_value)
+
+    return module
 
 
 def load_module_from_modpath(parts):