bpo-42133: update parts of the stdlib to fall back to `__spec__.loade… · python/cpython@825ac38 · GitHub
Skip to content

Commit 825ac38

Browse files
brettcannonbrettcannon
authored
bpo-42133: update parts of the stdlib to fall back to __spec__.loader when __loader__ is missing (#22929)
1 parent 7c01f15 commit 825ac38

6 files changed

Lines changed: 59 additions & 14 deletions

File tree

‎Doc/whatsnew/3.10.rst‎

Lines changed: 24 additions & 0 deletions

‎Lib/doctest.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,17 @@ def _load_testfile(filename, package, module_relative, encoding):
222222
if module_relative:
223223
package = _normalize_module(package, 3)
224224
filename = _module_relative_path(package, filename)
225-
if getattr(package, '__loader__', None) is not None:
226-
if hasattr(package.__loader__, 'get_data'):
227-
file_contents = package.__loader__.get_data(filename)
228-
file_contents = file_contents.decode(encoding)
229-
# get_data() opens files as 'rb', so one must do the equivalent
230-
# conversion as universal newlines would do.
231-
return _newline_convert(file_contents), filename
225+
if (loader := getattr(package, '__loader__', None)) is None:
226+
try:
227+
loader = package.__spec__.loader
228+
except AttributeError:
229+
pass
230+
if hasattr(loader, 'get_data'):
231+
file_contents = loader.get_data(filename)
232+
file_contents = file_contents.decode(encoding)
233+
# get_data() opens files as 'rb', so one must do the equivalent
234+
# conversion as universal newlines would do.
235+
return _newline_convert(file_contents), filename
232236
with open(filename, encoding=encoding) as f:
233237
return f.read(), filename
234238

‎Lib/inspect.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,10 +707,13 @@ def getsourcefile(object):
707707
if os.path.exists(filename):
708708
return filename
709709
# only return a non-existent filename if the module has a PEP 302 loader
710-
if getattr(getmodule(object, filename), '__loader__', None) is not None:
710+
module = getmodule(object, filename)
711+
if getattr(module, '__loader__', None) is not None:
712+
return filename
713+
elif getattr(getattr(module, "__spec__", None), "loader", None) is not None:
711714
return filename
712715
# or it is in the linecache
713-
if filename in linecache.cache:
716+
elif filename in linecache.cache:
714717
return filename
715718

716719
def getabsfile(object, _filename=None):

‎Lib/linecache.py‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,14 @@ def lazycache(filename, module_globals):
165165
if not filename or (filename.startswith('<') and filename.endswith('>')):
166166
return False
167167
# Try for a __loader__, if available
168-
if module_globals and '__loader__' in module_globals:
169-
name = module_globals.get('__name__')
170-
loader = module_globals['__loader__']
168+
if module_globals and '__name__' in module_globals:
169+
name = module_globals['__name__']
170+
if (loader := module_globals.get('__loader__')) is None:
171+
if spec := module_globals.get('__spec__'):
172+
try:
173+
loader = spec.loader
174+
except AttributeError:
175+
pass
171176
get_source = getattr(loader, 'get_source', None)
172177

173178
if name and get_source:

‎Lib/site.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,15 @@ def makepath(*paths):
105105
def abs_paths():
106106
"""Set all module __file__ and __cached__ attributes to an absolute path"""
107107
for m in set(sys.modules.values()):
108-
if (getattr(getattr(m, '__loader__', None), '__module__', None) not in
109-
('_frozen_importlib', '_frozen_importlib_external')):
108+
loader_module = None
109+
try:
110+
loader_module = m.__loader__.__module__
111+
except AttributeError:
112+
try:
113+
loader_module = m.__spec__.loader.__module__
114+
except AttributeError:
115+
pass
116+
if loader_module not in {'_frozen_importlib', '_frozen_importlib_external'}:
110117
continue # don't mess with a PEP 302-supplied __file__
111118
try:
112119
m.__file__ = os.path.abspath(m.__file__)

‎Misc/NEWS.d/next/Library/2020-10-23-15-47-47.bpo-42133.BzizYV.rst‎

Lines changed: 2 additions & 0 deletions

0 commit comments

Comments
 (0)