Skip to content

bpo-35321: Set the spec origin to frozen in frozen modules #11732

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
warsaw merged 2 commits into from
Feb 5, 2019
Merged

bpo-35321: Set the spec origin to frozen in frozen modules #11732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3dac6
bpo-35321: Set the spec origin to frozen in frozen modules
nnja Feb 2, 2019
7a2619d
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 2, 2019
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
6 changes: 4 additions & 2 deletions Lib/importlib/_bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,19 +786,21 @@ class FrozenImporter:

"""

_ORIGIN = "frozen"

@staticmethod
def module_repr(m):
"""Return repr for the module.

The method is deprecated. The import machinery does the job itself.

"""
return '<module {!r} (frozen)>'.format(m.__name__)
return '<module {!r} ({})>'.format(m.__name__, FrozenImporter._ORIGIN)

@classmethod
def find_spec(cls, fullname, path=None, target=None):
if _imp.is_frozen(fullname):
return spec_from_loader(fullname, cls, origin='frozen')
return spec_from_loader(fullname, cls, origin=cls._ORIGIN)
else:
return None

Expand Down
11 changes: 11 additions & 0 deletions Lib/test/test_imp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,17 @@ class BadSpec:
with self.assertRaises(TypeError):
create_dynamic(BadSpec())

def test_issue_35321(self):
# Both _frozen_importlib and _frozen_importlib_external
# should have a spec origin of "frozen" and
# no need to clean up imports in this case.

import _frozen_importlib_external
self.assertEqual(_frozen_importlib_external.__spec__.origin, "frozen")

import _frozen_importlib
self.assertEqual(_frozen_importlib.__spec__.origin, "frozen")

def test_source_hash(self):
self.assertEqual(_imp.source_hash(42, b'hi'), b'\xc6\xe7Z\r\x03:}\xab')
self.assertEqual(_imp.source_hash(43, b'hi'), b'\x85\x9765\xf8\x9a\x8b9')
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-02-02-01-53-36.bpo-35321.1Y4DU4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Set ``__spec__.origin`` of ``_frozen_importlib`` to frozen so that it matches the behavior of ``_frozen_importlib_external``. Patch by Nina Zakharenko.
Loading