May 20, 2025 · May 19, 2025 · May 19, 2025 · May 19, 2025 · May 19, 2025 · May 19, 2025
diff --git a/Lib/_pyrepl/_module_completer.py b/Lib/_pyrepl/_module_completer.py
 from dataclasses import dataclass
 from itertools import chain
 from tokenize import TokenInfo
 from .trace import trace

 TYPE_CHECKING = False

    def find_modules(self, path: str, prefix: str) -> list[str]:
        """Find all modules under 'path' that start with 'prefix'."""
        modules = self._find_modules(path, prefix)
        trace(">> path {path} prefix {prefix}", path=path, prefix=prefix)
        # Filter out invalid module names
        # (for example those containing dashes that cannot be imported with 'import')
        return [mod for mod in modules if mod.isidentifier()]
        if not path:
            # Top-level import (e.g. `import foo<tab>`` or `from foo<tab>`)`
            return [name for _, name, _ in self.global_cache
                    ifname.startswith(prefix)]
                    ifself._should_add_module_name(name,prefix)]

        if path.startswith('.'):
            # Convert relative path to absolute path
            modules = [mod_info for mod_info in modules
                       if mod_info.ispkg and mod_info.name == segment]
            modules = self.iter_submodules(modules)

        return [module.name for module in modules
                if module.name.startswith(prefix)]
                if self._should_add_module_name(module.name, prefix)]

    def _should_add_module_name(self, module_name: str, prefix: str) -> bool:
        prefix_modules = prefix and module_name.startswith(prefix)
        public_modules = not prefix and not module_name.startswith("_")
        return prefix_modules or public_modules

    def iter_submodules(self, parent_modules: list[pkgutil.ModuleInfo]) -> Iterator[pkgutil.ModuleInfo]:
        """Iterate over all submodules of the given parent modules."""
diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py
 import subprocess
 import sys
 import tempfile
 from pkgutil import ModuleInfo
 from unittest import TestCase, skipUnless, skipIf
 from unittest.mock import patch
 from test.support import force_not_colorized, make_clean_env
                output = reader.readline()
                self.assertEqual(output, expected)

    @patch("pkgutil.iter_modules", lambda: [(None, 'public', None),
                                            (None, '_private', None)])
    def test_private_completions(self):
        cases = (
            # Return public methods by default
            ("import \t\n", "import public"),
            ("from \t\n", "from public"),
            # Return private methods if explicitly specified
            ("import _\t\n", "import _private"),
            ("from _\t\n", "from _private"),
        )
        for code, expected in cases:
            with self.subTest(code=code):
                events = code_to_events(code)
                reader = self.prepare_reader(events, namespace={})
                output = reader.readline()
                self.assertEqual(output, expected)

    @patch(
        "_pyrepl._module_completer.ModuleCompleter.iter_submodules",
        lambda *_: [
            ModuleInfo(None, "public", True),
            ModuleInfo(None, "_private", True),
        ],
    )
    def test_sub_module_private_completions(self):
        cases = (
            # Return public methods by default
            ("from foo import \t\n", "from foo import public"),
            # Return private methods if explicitly specified
            ("from foo import _\t\n", "from foo import _private"),
        )
        for code, expected in cases:
            with self.subTest(code=code):
                events = code_to_events(code)
                reader = self.prepare_reader(events, namespace={})
                output = reader.readline()
                self.assertEqual(output, expected)

    def test_relative_import_completions(self):
        cases = (
            ("from .readl\t\n", "from .readline"),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		from dataclasses import dataclass
		from itertools import chain
		from tokenize import TokenInfo
		from .trace import trace

		TYPE_CHECKING = False

Expand DownExpand Up		@@ -74,6 +75,7 @@ def complete(self, from_name: str \| None, name: str \| None) -> list[str]:
		def find_modules(self, path: str, prefix: str) -> list[str]:
		"""Find all modules under 'path' that start with 'prefix'."""
		modules = self._find_modules(path, prefix)
		trace(">> path {path} prefix {prefix}", path=path, prefix=prefix)
		# Filter out invalid module names
		# (for example those containing dashes that cannot be imported with 'import')
		return [mod for mod in modules if mod.isidentifier()]
Expand All		@@ -82,7 +84,7 @@ def _find_modules(self, path: str, prefix: str) -> list[str]:
		if not path:
		# Top-level import (e.g. `import foo<tab>`` or `from foo<tab>`)`
		return [name for _, name, _ in self.global_cache
		ifname.startswith(prefix)]
		ifself._should_add_module_name(name,prefix)]

		if path.startswith('.'):
		# Convert relative path to absolute path
Expand All		@@ -96,8 +98,14 @@ def _find_modules(self, path: str, prefix: str) -> list[str]:
		modules = [mod_info for mod_info in modules
		if mod_info.ispkg and mod_info.name == segment]
		modules = self.iter_submodules(modules)

		return [module.name for module in modules
		if module.name.startswith(prefix)]
		if self._should_add_module_name(module.name, prefix)]

		def _should_add_module_name(self, module_name: str, prefix: str) -> bool:
kevteg marked this conversation as resolved. Show resolvedHide resolved
		prefix_modules = prefix and module_name.startswith(prefix)
		public_modules = not prefix and not module_name.startswith("_")
		return prefix_modules or public_modules

		def iter_submodules(self, parent_modules: list[pkgutil.ModuleInfo]) -> Iterator[pkgutil.ModuleInfo]:
		"""Iterate over all submodules of the given parent modules."""
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,7 @@
		import subprocess
		import sys
		import tempfile
		from pkgutil import ModuleInfo
		from unittest import TestCase, skipUnless, skipIf
		from unittest.mock import patch
		from test.support import force_not_colorized, make_clean_env
Expand DownExpand Up		@@ -959,6 +960,45 @@ def test_import_completions(self):
		output = reader.readline()
		self.assertEqual(output, expected)

		@patch("pkgutil.iter_modules", lambda: [(None, 'public', None),
		(None, '_private', None)])
		def test_private_completions(self):
		cases = (
		# Return public methods by default
		("import \t\n", "import public"),
		("from \t\n", "from public"),
		# Return private methods if explicitly specified
		("import _\t\n", "import _private"),
		("from _\t\n", "from _private"),
		)
		for code, expected in cases:
		with self.subTest(code=code):
		events = code_to_events(code)
		reader = self.prepare_reader(events, namespace={})
		output = reader.readline()
		self.assertEqual(output, expected)

		@patch(
		"_pyrepl._module_completer.ModuleCompleter.iter_submodules",
		lambda *_: [
		ModuleInfo(None, "public", True),
		ModuleInfo(None, "_private", True),
		],
		)
		def test_sub_module_private_completions(self):
		cases = (
		# Return public methods by default
		("from foo import \t\n", "from foo import public"),
		# Return private methods if explicitly specified
		("from foo import _\t\n", "from foo import _private"),
		)
		for code, expected in cases:
		with self.subTest(code=code):
		events = code_to_events(code)
		reader = self.prepare_reader(events, namespace={})
		output = reader.readline()
		self.assertEqual(output, expected)

		def test_relative_import_completions(self):
		cases = (
		("from .readl\t\n", "from .readline"),
Expand Down