[3.13] gh-123085: Fix issue in inferred caller when resource package has no source (GH-123102) by jaraco · Pull Request #124024 · python/cpython · GitHub
Skip to content

[3.13] gh-123085: Fix issue in inferred caller when resource package has no source (GH-123102) #124024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaraco merged 6 commits into from
Aug 15, 2025
+43 −4
Merged

[3.13] gh-123085: Fix issue in inferred caller when resource package has no source (GH-123102) #124024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ec873e
gh-121735: Fix module-adjacent references in zip files (GH-123037)
jaraco Sep 12, 2024
92f9a53
gh-123994: Generate utf-16 file using little endian and BOM. (#123995)
jaraco Sep 12, 2024
50c8d2d
[3.13] gh-123085: Fix issue in inferred caller when resource package …
jaraco Sep 12, 2024
6280559
Merge branch '3.13' into backport-a53812d-3.13
jaraco Jan 5, 2025
5b9c51a
Removing news fragment from unrelated PR.
jaraco Jan 5, 2025
99332ee
Merge remote-tracking branch 'upstream/3.13' into backport-a53812d-3.13
pablogsal Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Lib/importlib/resources/_common.py
View file
Open in desktop
39 changes: 37 additions & 2 deletions Lib/test/test_importlib/resources/test_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import os
import pathlib
import py_compile
import shutil
import textwrap
import unittest
import warnings
Expand All @@ -7,6 +11,7 @@
from importlib import resources
from importlib.resources.abc import Traversable
from . import util
from test.support import os_helper, import_helper


@contextlib.contextmanager
Expand Down Expand Up @@ -117,8 +122,8 @@ class ModuleFilesZipTests(DirectSpec, util.ZipSetup, ModulesFiles, unittest.Test

class ImplicitContextFiles:
set_val = textwrap.dedent(
"""
import importlib.resources as res
f"""
import {resources.__name__} as res
val = res.files().joinpath('res.txt').read_text(encoding='utf-8')
"""
)
Expand All @@ -128,6 +133,10 @@ class ImplicitContextFiles:
'submod.py': set_val,
'res.txt': 'resources are the best',
},
'frozenpkg': {
'__init__.py': set_val.replace(resources.__name__, 'c_resources'),
'res.txt': 'resources are the best',
},
}

def test_implicit_files_package(self):
Expand All @@ -142,6 +151,32 @@ def test_implicit_files_submodule(self):
"""
assert importlib.import_module('somepkg.submod').val == 'resources are the best'

def _compile_importlib(self):
"""
Make a compiled-only copy of the importlib resources package.
"""
bin_site = self.fixtures.enter_context(os_helper.temp_dir())
c_resources = pathlib.Path(bin_site, 'c_resources')
sources = pathlib.Path(resources.__file__).parent
shutil.copytree(sources, c_resources, ignore=lambda *_: ['__pycache__'])

for dirpath, _, filenames in os.walk(c_resources):
for filename in filenames:
source_path = pathlib.Path(dirpath) / filename
cfile = source_path.with_suffix('.pyc')
py_compile.compile(source_path, cfile)
pathlib.Path.unlink(source_path)
self.fixtures.enter_context(import_helper.DirsOnSysPath(bin_site))

def test_implicit_files_with_compiled_importlib(self):
"""
Caller detection works for compiled-only resources module.

python/cpython#123085
"""
self._compile_importlib()
assert importlib.import_module('frozenpkg').val == 'resources are the best'


class ImplicitContextFilesDiskTests(
DirectSpec, util.DiskSetup, ImplicitContextFiles, unittest.TestCase
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2024-08-17-08-17-20.gh-issue-123085.7Io2yH.rst
View file
Open in desktop
Loading