Kaydet (Commit) f4375ef4 authored tarafından Brett Cannon's avatar Brett Cannon

importlib.abc.SourceLoader.get_source() was re-raising SyntaxError and

UnicodeDecodeError as ImportError. That was over-reaching the point of
raising ImportError in get_source() (which is to signal the source
code was not found when it should have). Conflating the two exceptions
with ImportError could lead to masking errors with the source which
should be known outside of whether there was an error simply getting
the source to begin with.
üst 01b0475b
......@@ -282,3 +282,12 @@ that may require changes to your code.
it would write to is a symlink or a non-regular file. This is to act as a
warning that import will overwrite those files with a regular file regardless
of what type of file path they were originally.
* :meth:`importlib.abc.SourceLoader.get_source` no longer raises
:exc:`ImportError` when the source code being loaded triggers a
:exc:`SyntaxError` or :exc:`UnicodeDecodeError`. As :exc:`ImportError` is
meant to be raised only when source code cannot be found but it should, it was
felt to be over-reaching/overloading of that meaning when the source code is
found but improperly structured. If you were catching ImportError before and
wish to continue to ignore syntax or decoding issues, catch all three
exceptions now.
\ No newline at end of file
......@@ -959,25 +959,17 @@ class SourceLoader(_LoaderBasics):
def get_source(self, fullname):
"""Concrete implementation of InspectLoader.get_source."""
import tokenize
path = self.get_filename(fullname)
try:
source_bytes = self.get_data(path)
except OSError as exc:
raise ImportError("source not available through get_data()",
name=fullname) from exc
import tokenize
readsource = _io.BytesIO(source_bytes).readline
try:
encoding = tokenize.detect_encoding(readsource)
except SyntaxError as exc:
raise ImportError("Failed to detect encoding",
name=fullname) from exc
encoding = tokenize.detect_encoding(readsource)
newline_decoder = _io.IncrementalNewlineDecoder(None, True)
try:
return newline_decoder.decode(source_bytes.decode(encoding[0]))
except UnicodeDecodeError as exc:
raise ImportError("Failed to decode source file",
name=fullname) from exc
return newline_decoder.decode(source_bytes.decode(encoding[0]))
def source_to_code(self, data, path, *, _optimize=-1):
"""Return the code object compiled from source.
......
......@@ -123,6 +123,9 @@ Core and Builtins
Library
-------
- importlib.abc.SourceLoader.get_source() no longer changes SyntaxError or
UnicodeDecodeError into ImportError.
- Issue #18058, 18057: Make the namespace package loader meet the
importlib.abc.InspectLoader ABC, allowing for namespace packages to work with
runpy.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment