From b4e522a4f793ab665c2b57a160fd9cc134bdfdb9 Mon Sep 17 00:00:00 2001 From: shadchin Date: Wed, 14 Jan 2026 10:09:33 +0300 Subject: Get rid of `BuiltinSubmoduleImporter` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Для современных Python 3 нет никакой разницы между `BuiltinImporter` и `BuiltinSubmoduleImporter` (наша переопределённая копия `BuiltinImporter`), мы только добавляем лишнюю сложность, потому предлагаю удалить `BuiltinSubmoduleImporter` как больше не нужную сущность. commit_hash:93663cc0cedd41d931a92c407b9966d580d42dd7 --- library/python/runtime_py3/__res.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'library/python') diff --git a/library/python/runtime_py3/__res.py b/library/python/runtime_py3/__res.py index 9fb2d09481a..c2f94a4b245 100644 --- a/library/python/runtime_py3/__res.py +++ b/library/python/runtime_py3/__res.py @@ -13,7 +13,7 @@ import marshal import sys from _codecs import utf_8_decode, utf_8_encode -from _frozen_importlib import _call_with_frames_removed, spec_from_loader, BuiltinImporter +from _frozen_importlib import _call_with_frames_removed, spec_from_loader from _frozen_importlib_external import ( _os, _path_isfile, @@ -590,15 +590,6 @@ class _ResfsResourceReader: return sitecustomize.ArcadiaResourceContainer(f"resfs/file/{self.path}/") -class BuiltinSubmoduleImporter(BuiltinImporter): - @classmethod - def find_spec(cls, fullname, path=None, target=None): - if path is not None: - return super().find_spec(fullname, None, target) - else: - return None - - class ArcadiaSourceFinder: """ Search modules and packages in arcadia source tree. @@ -780,7 +771,6 @@ def get_path0(): if YA_IDE_VENV: sys.meta_path.append(importer) - sys.meta_path.append(BuiltinSubmoduleImporter) if executable not in sys.path: sys.path.append(executable) path0 = get_path0() @@ -789,7 +779,6 @@ if YA_IDE_VENV: sys.path_hooks.append(executable_path_hook) else: - sys.meta_path.insert(0, BuiltinSubmoduleImporter) sys.meta_path.insert(0, importer) if executable not in sys.path: sys.path.insert(0, executable) -- cgit v1.3