Preliminary changes 2

- Responses to review comments
- Add test for calling _astroid_module_checker on different levels
- Move Path.resolve() out of _get_namespace_for_file recursive calls

pylint/config/config_initialization.py

@@ -145,7 +145,7 @@ def _config_initialization(
  linter._parse_error_mode()
 
  # Link the base Namespace object on the current directory
- if Path(".").resolve() not in linter._directory_namespaces:
+ if len(linter._directory_namespaces) == 0:
  linter._directory_namespaces[Path(".").resolve()] = (linter.config, {})
 
  # parsed_args_list should now only be a list of inputs to lint.

pylint/config/find_default_config_files.py

@@ -64,7 +64,7 @@ def _cfg_has_config(path: Path | str) -> bool:
  return any(section.startswith("pylint.") for section in parser.sections())
 
 
-def _yield_default_files(basedir: Path | str = ".") -> Iterator[Path]:
+def _yield_default_files(basedir: Path = Path(".")) -> Iterator[Path]:
  """Iterate over the default config file names and see if they exist."""
  basedir = Path(basedir)
  for config_name in CONFIG_NAMES:
@@ -144,8 +144,3 @@ def find_default_config_files() -> Iterator[Path]:
  yield Path("/etc/pylintrc").resolve()
  except OSError:
  pass
-
-
-def find_subdirectory_config_files(basedir: Path | str) -> Iterator[Path]:
- """Find config file in arbitrary subdirectory."""
- yield from _yield_default_files(basedir)

pylint/lint/pylinter.py

@@ -927,7 +927,7 @@ def set_current_module(self, modname: str, filepath: str | None = None) -> None:
  # If there is an actual filepath we might need to update the config attribute
  if filepath:
  config_path, namespace = self._get_namespace_for_file(
- Path(filepath), self._directory_namespaces
+ Path(filepath).resolve(), self._directory_namespaces
  )
  if namespace:
  self.config = namespace
@@ -940,7 +940,6 @@ def set_current_module(self, modname: str, filepath: str | None = None) -> None:
  def _get_namespace_for_file(
  self, filepath: Path, namespaces: DirectoryNamespaceDict
  ) -> tuple[Path | None, argparse.Namespace | None]:
- filepath = filepath.resolve()
  for directory in namespaces:
  if _is_relative_to(filepath, directory):
  _, namespace = self._get_namespace_for_file(

tests/lint/test_pylinter.py

@@ -9,8 +9,10 @@
 from unittest.mock import patch
 
 from pytest import CaptureFixture
+from test_regr import REGR_DATA
 
 from pylint.lint.pylinter import PyLinter
+from pylint.typing import FileItem
 from pylint.utils import FileState
 
 
@@ -48,3 +50,21 @@ def test_crash_during_linting(
  assert len(files) == 1
  assert "pylint-crash-20" in str(files[0])
  assert any(m.symbol == "astroid-error" for m in linter.reporter.messages)
+
+
+def test_global_vs_local_astroid_module() -> None:
+ fileitems = iter(
+ [
+ FileItem("filename", __file__, "modname"),
+ FileItem("name2", str(Path(REGR_DATA, "decimal_inference.py")), "mod2"),
+ ]
+ )
+ linter1 = PyLinter()
+ ast_mapping = linter1._get_asts(fileitems, None)
+ with linter1._astroid_module_checker() as check_astroid_module:
+ linter1._lint_files(ast_mapping, check_astroid_module)
+ stats1 = linter1.stats
+ linter2 = PyLinter()
+ linter2._lint_files(ast_mapping, None)
+ stats2 = linter2.stats
+ assert str(stats1) == str(stats2)